ffmpeg: 2.8.1 -> 2.8.3

This commit is contained in:
Danny Rawlins 2015-12-03 19:57:26 +11:00
parent 8cf2c49757
commit ea2240726a
3 changed files with 45 additions and 3 deletions

View File

@ -1 +1,2 @@
63b2cfeea930e942ff7579fd0064c5be ffmpeg-2.8.1.tar.bz2
937a6573ba399cf3e6808c9c6ea3d6d6 ffmpeg-2.8.3.tar.bz2
516842cf398ccd92105bca4e9ce46a86 ffmpeg-libvpx-1.5.0.patch

View File

@ -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 \

View File

@ -0,0 +1,38 @@
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",