diff options
| author | Ben Widawsky | 2015-11-10 18:52:20 -0800 |
|---|---|---|
| committer | Ben Widawsky | 2015-11-10 19:25:01 -0800 |
| commit | 9c8d019bf082b420e68ad68400d111c45c4b3178 (patch) | |
| tree | e6af7c853dfe5238866f3e396385278b3ce06e32 /ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | |
| parent | 012521a2608c189e8f2eea35fd9db83c9cae9404 (diff) | |
| download | aur-9c8d019bf082b420e68ad68400d111c45c4b3178.tar.gz | |
Pull in upstream's libvpx support
commit 5386618a53be68fd5db153a7598a7e80eda8cf6c
Author: bpiotrowski <bpiotrowski@eb2447ed-0c53-47e4-bac8-5bc4a241df78>
Date: Tue Nov 10 13:21:27 2015 +0000
Backport upstream fix for libvpx 1.5.0 compatibility
git-svn-id: file:///srv/repos/svn-packages/svn@250536 eb2447ed-0c53-47e4-bac8-5bc4a241df78
Diffstat (limited to 'ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch')
| -rw-r--r-- | ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch new file mode 100644 index 000000000000..15d2600d1c47 --- /dev/null +++ b/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch @@ -0,0 +1,41 @@ +From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 +From: James Zern <jzern@google.com> +Date: Mon, 19 Oct 2015 22:44:11 -0700 +Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings + +VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed +from libvpx and the remaining values were never used here + +Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> +Signed-off-by: James Zern <jzern@google.com> +--- + libavcodec/libvpxenc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", +-- +1.7.10.4 + |