From e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333 Mon Sep 17 00:00:00 2001 From: Christophe Gisquet Date: Thu, 1 Oct 2015 16:54:57 +0200 Subject: dnxhddata: Deduplicate cid 1256 chroma table CID 1256 is specified as using the same table for luma and chroma, which is the same as CID 1235 luma table. This is consistent with the format supposedly being RGB, although most sequences seem to actually be YCbCr-encoded. Signed-off-by: Michael Niedermayer Signed-off-by: Vittorio Giovara --- libavcodec/dnxhddata.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'libavcodec/dnxhddata.c') diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index 46b697c451..282829eeb2 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -37,6 +37,7 @@ static const uint8_t dnxhd_1235_luma_weight[] = { 50, 50, 53, 55, 55, 56, 60, 60, }; +/* Used in CID 1235, 1256 */ static const uint8_t dnxhd_1235_chroma_weight[] = { 0, 32, 33, 34, 34, 33, 34, 35, 37, 40, 43, 42, 39, 38, 39, 41, @@ -228,17 +229,6 @@ static const uint8_t dnxhd_1252_chroma_weight[] = { 114, 128, 125, 129, 134, 125, 116, 116, }; -static const uint8_t dnxhd_1256_chroma_weight[] = { - 0, 32, 32, 32, 32, 32, 32, 33, - 32, 32, 32, 32, 32, 32, 32, 34, - 32, 32, 32, 32, 32, 32, 33, 37, - 32, 32, 32, 32, 32, 32, 36, 39, - 32, 32, 32, 32, 32, 34, 39, 44, - 32, 37, 32, 32, 35, 40, 43, 49, - 32, 33, 36, 36, 40, 43, 50, 60, - 34, 37, 39, 44, 51, 56, 61, 70, -}; - static const uint8_t dnxhd_1260_luma_weight[] = { 0, 32, 33, 34, 36, 37, 37, 36, 34, 33, 34, 35, 37, 38, 40, 41, @@ -1156,7 +1146,7 @@ const CIDEntry ff_dnxhd_cid_table[] = { dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run, { 36, 45, 75, 90 } }, { 1256, 1920, 1080, 0, 1835008, 1835008, 6, 10, - dnxhd_1235_luma_weight, dnxhd_1256_chroma_weight, + dnxhd_1235_luma_weight, dnxhd_1235_chroma_weight, dnxhd_1235_dc_codes, dnxhd_1235_dc_bits, dnxhd_1235_ac_codes, dnxhd_1235_ac_bits, dnxhd_1235_ac_level, dnxhd_1235_ac_run_flag, dnxhd_1235_ac_index_flag, -- cgit v1.2.3