diff options
| author | Danny Rawlins <monster.romster@gmail.com> | 2016-01-12 10:54:03 +1100 |
|---|---|---|
| committer | Danny Rawlins <monster.romster@gmail.com> | 2016-01-12 10:56:42 +1100 |
| commit | 15dfb98370dacb04464f42fd0704e449bb7e9dcc (patch) | |
| tree | c1a60c62d7ecfa0f54a2c3072bd600cd6249b6a5 /ffmpeg | |
| parent | c66e542fb1f8edfbe2574169f66711890a1679b4 (diff) | |
| download | contrib-15dfb98370dacb04464f42fd0704e449bb7e9dcc.tar.gz contrib-15dfb98370dacb04464f42fd0704e449bb7e9dcc.tar.xz | |
ffmpeg: 2.8.3 -> 2.8.4
Diffstat (limited to 'ffmpeg')
| -rw-r--r-- | ffmpeg/.md5sum | 3 | ||||
| -rw-r--r-- | ffmpeg/Pkgfile | 7 | ||||
| -rw-r--r-- | ffmpeg/ffmpeg-libvpx-1.5.0.patch | 38 |
3 files changed, 3 insertions, 45 deletions
diff --git a/ffmpeg/.md5sum b/ffmpeg/.md5sum index de9a86aec..fb2b63d62 100644 --- a/ffmpeg/.md5sum +++ b/ffmpeg/.md5sum @@ -1,2 +1 @@ -937a6573ba399cf3e6808c9c6ea3d6d6 ffmpeg-2.8.3.tar.bz2 -516842cf398ccd92105bca4e9ce46a86 ffmpeg-libvpx-1.5.0.patch +5a312bebaf71688703644c18ef3f26e8 ffmpeg-2.8.4.tar.bz2 diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile index b897bdcec..c5c36cdfe 100644 --- a/ffmpeg/Pkgfile +++ b/ffmpeg/Pkgfile @@ -5,16 +5,13 @@ # 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.3 +version=2.8.4 release=1 -source=(http://ffmpeg.org/releases/$name-$version.tar.bz2 - ffmpeg-libvpx-1.5.0.patch) +source=(http://ffmpeg.org/releases/$name-$version.tar.bz2) 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 deleted file mode 100644 index 8efef15d7..000000000 --- a/ffmpeg/ffmpeg-libvpx-1.5.0.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: James Zern <jzern@google.com> -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 <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", |