diff options
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch | 41 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.SlackBuild | 5 | ||||
| -rw-r--r-- | multimedia/ffmpeg/ffmpeg.info | 6 |
3 files changed, 48 insertions, 4 deletions
diff --git a/multimedia/ffmpeg/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/multimedia/ffmpeg/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch new file mode 100644 index 0000000000..15d2600d1c --- /dev/null +++ b/multimedia/ffmpeg/ffmpeg-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 + diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild index feb7d2a770..2755afc99e 100644 --- a/multimedia/ffmpeg/ffmpeg.SlackBuild +++ b/multimedia/ffmpeg/ffmpeg.SlackBuild @@ -26,7 +26,7 @@ # Modified by Robby Workman <rworkman@slackbuilds.org> PRGNAM=ffmpeg -VERSION=${VERSION:-2.6.3} +VERSION=${VERSION:-2.6.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -141,6 +141,9 @@ find -L . \ sed -i "s| -lflite\"| -lflite -lm -lasound\"|" \ ./configure +# Some variables are removed from newer libvpx releases +patch -p1 < $CWD/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info index f13ce573ae..944d9c061f 100644 --- a/multimedia/ffmpeg/ffmpeg.info +++ b/multimedia/ffmpeg/ffmpeg.info @@ -1,8 +1,8 @@ PRGNAM="ffmpeg" -VERSION="2.6.3" +VERSION="2.6.6" HOMEPAGE="http://www.ffmpeg.org" -DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.6.3.tar.bz2" -MD5SUM="e2cc3c209f91393d35ab58598e41cf22" +DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.6.6.tar.bz2" +MD5SUM="f7fce342f4c947376bf8ee6936681776" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" |