Magellan Linux

Contents of /trunk/ffmpeg/patches/ffmpeg-2.8.1-libvpxenc-remove-some-unused-ctrl-id-mappings.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2732 - (show annotations) (download)
Thu Dec 3 11:45:52 2015 UTC (8 years, 5 months ago) by niro
File size: 1800 byte(s)
-addded ftbfs fix with newer libvpx
1 From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001
2 From: James Zern <jzern@google.com>
3 Date: Mon, 19 Oct 2015 22:44:11 -0700
4 Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings
5
6 VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed
7 from libvpx and the remaining values were never used here
8
9 Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
10 Signed-off-by: James Zern <jzern@google.com>
11 ---
12 libavcodec/libvpxenc.c | 8 --------
13 1 file changed, 8 deletions(-)
14
15 diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
16 index 5f39783..992122c 100644
17 --- a/libavcodec/libvpxenc.c
18 +++ b/libavcodec/libvpxenc.c
19 @@ -104,19 +104,11 @@ typedef struct VP8EncoderContext {
20
21 /** String mappings for enum vp8e_enc_control_id */
22 static const char *const ctlidstr[] = {
23 - [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
24 - [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
25 - [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",
26 - [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP",
27 - [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP",
28 - [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE",
29 [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED",
30 [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF",
31 [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY",
32 - [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS",
33 [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD",
34 [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS",
35 - [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER",
36 [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES",
37 [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
38 [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",
39 --
40 1.7.10.4
41