From ea2240726ae372033bbd92ab9d404080a489299d Mon Sep 17 00:00:00 2001 From: Danny Rawlins Date: Thu, 3 Dec 2015 19:57:26 +1100 Subject: [PATCH] ffmpeg: 2.8.1 -> 2.8.3 --- ffmpeg/.md5sum | 3 ++- ffmpeg/Pkgfile | 7 ++++-- ffmpeg/ffmpeg-libvpx-1.5.0.patch | 38 ++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 ffmpeg/ffmpeg-libvpx-1.5.0.patch diff --git a/ffmpeg/.md5sum b/ffmpeg/.md5sum index c6a0bc254..de9a86aec 100644 --- a/ffmpeg/.md5sum +++ b/ffmpeg/.md5sum @@ -1 +1,2 @@ -63b2cfeea930e942ff7579fd0064c5be ffmpeg-2.8.1.tar.bz2 +937a6573ba399cf3e6808c9c6ea3d6d6 ffmpeg-2.8.3.tar.bz2 +516842cf398ccd92105bca4e9ce46a86 ffmpeg-libvpx-1.5.0.patch diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile index a397f1b6e..b897bdcec 100644 --- a/ffmpeg/Pkgfile +++ b/ffmpeg/Pkgfile @@ -5,13 +5,16 @@ # Depends on: gnutls lame libass libbluray libgmp libmodplug libsdl libtheora libva libvpx libxvid opencore-amr openjpeg opus rtmpdump schroedinger speex x264 x265 name=ffmpeg -version=2.8.1 +version=2.8.3 release=1 -source=(http://ffmpeg.org/releases/$name-$version.tar.bz2) +source=(http://ffmpeg.org/releases/$name-$version.tar.bz2 + ffmpeg-libvpx-1.5.0.patch) build() { cd $name-$version + patch -p1 -i $SRC/ffmpeg-libvpx-1.5.0.patch + ./configure \ --prefix=/usr \ --mandir=/usr/man \ diff --git a/ffmpeg/ffmpeg-libvpx-1.5.0.patch b/ffmpeg/ffmpeg-libvpx-1.5.0.patch new file mode 100644 index 000000000..8efef15d7 --- /dev/null +++ b/ffmpeg/ffmpeg-libvpx-1.5.0.patch @@ -0,0 +1,38 @@ +From: James Zern +Date: Tue, 20 Oct 2015 05:44:11 +0000 (-0700) +Subject: libvpxenc: remove some unused ctrl id mappings +X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab + +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 +Signed-off-by: James Zern +--- + +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",