diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-11-12 12:10:54 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-11-12 12:46:43 +0100 |
| commit | 432addcb0d1934705424e9712cdb3d735c15ac5d (patch) | |
| tree | e9e952f5fa6710055798715740d1e88f0b2f77be /media-video/ffmpeg/files | |
| parent | media-video/ffmpeg: add := dep on libvpx (diff) | |
| download | gentoo-432addcb0d1934705424e9712cdb3d735c15ac5d.tar.gz gentoo-432addcb0d1934705424e9712cdb3d735c15ac5d.tar.bz2 gentoo-432addcb0d1934705424e9712cdb3d735c15ac5d.zip | |
media-video/ffmpeg: bump to 2.8.2 and backport upstream fix to build with libvpx 1.5
Package-Manager: portage-2.2.24
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'media-video/ffmpeg/files')
| -rw-r--r-- | media-video/ffmpeg/files/libvpx15.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/media-video/ffmpeg/files/libvpx15.patch b/media-video/ffmpeg/files/libvpx15.patch new file mode 100644 index 000000000000..ae3770c5dcb9 --- /dev/null +++ b/media-video/ffmpeg/files/libvpx15.patch @@ -0,0 +1,36 @@ +commit 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab +Author: James Zern <jzern@google.com> +Date: Mon Oct 19 22:44:11 2015 -0700 + + 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> + +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", |