[libav-commits] libvpxenc: remove some unused ctrl id mappings

2016-09-17 Thread James Zern 
Module: libav
Branch: release/11
Commit: 106892b268879824c4c946d6d0cff73c1275e18e

Author:James Zern 
Committer: Sean McGovern 
Date:  Mon Oct 19 22:44:11 2015 -0700

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 
Signed-off-by: Luca Barbato 
(cherry picked from commit 4d05e9392f84702e3c833efa86e84c7f1cf5f612)

Signed-off-by: Sean McGovern 

---

 libavcodec/libvpxenc.c |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 0323885..b2c6c32 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -70,23 +70,15 @@ 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_ARNR_MAXFRAMES]= "VP8E_SET_ARNR_MAXFRAMES",
+[VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
+[VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",
 [VP8E_SET_CPUUSED]   = "VP8E_SET_CPUUSED",
+[VP8E_SET_CQ_LEVEL]  = "VP8E_SET_CQ_LEVEL",
 [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",
-[VP8E_SET_CQ_LEVEL]  = "VP8E_SET_CQ_LEVEL",
 };
 
 static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)

___
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits

[libav-commits] libvpxenc: remove some unused ctrl id mappings

2015-11-23 Thread James Zern 
Module: libav
Branch: master
Commit: 4d05e9392f84702e3c833efa86e84c7f1cf5f612

Author:James Zern 
Committer: Luca Barbato 
Date:  Mon Oct 19 22:44:11 2015 -0700

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 
Signed-off-by: Luca Barbato 

---

 libavcodec/libvpxenc.c |   16 
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index 563117f..d1e2523 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -71,23 +71,15 @@ 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_ARNR_MAXFRAMES]= "VP8E_SET_ARNR_MAXFRAMES",
+[VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH",
+[VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE",
 [VP8E_SET_CPUUSED]   = "VP8E_SET_CPUUSED",
+[VP8E_SET_CQ_LEVEL]  = "VP8E_SET_CQ_LEVEL",
 [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",
-[VP8E_SET_CQ_LEVEL]  = "VP8E_SET_CQ_LEVEL",
 };
 
 static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc)

___
libav-commits mailing list
libav-commits@libav.org
https://lists.libav.org/mailman/listinfo/libav-commits