diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2015-09-28 17:30:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-30 00:27:07 +0200 |
| commit | e3242c021980e0a2688c27cb50674e7cd14c282a (patch) | |
| tree | 283a5d6fcd6a9fa40e35079a1258887036b8ba66 | |
| parent | 78cc19f15ead41909ddaf85cd5bad10036a93883 (diff) | |
| download | ffmpeg-e3242c021980e0a2688c27cb50674e7cd14c282a.tar.gz | |
dnxhddata: deduplicate 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 <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/dnxhddata.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index cc304e4eee..0cbc57b452 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -228,17 +228,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, 32, - 32, 32, 32, 32, 32, 32, 32, 32, - 32, 32, 32, 32, 32, 32, 37, 32, - 32, 32, 32, 32, 33, 32, 32, 32, - 32, 32, 33, 34, 37, 36, 32, 32, - 32, 33, 34, 37, 36, 34, 35, 36, - 39, 44, 40, 40, 39, 39, 44, 43, - 43, 51, 56, 50, 49, 60, 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, @@ -1041,7 +1030,7 @@ const CIDEntry ff_dnxhd_cid_table[] = { { 36, 36, 45, 75, 90 }, { { 24000, 1001 }, { 25, 1 }, { 30000, 1001 }, { 50, 1 }, { 60000, 1001 } } }, { 1256, 1920, 1080, 0, 1835008, 1835008, 6, 10, 4, - dnxhd_1235_luma_weight, dnxhd_1256_chroma_weight, + dnxhd_1235_luma_weight, dnxhd_1235_luma_weight, dnxhd_1235_dc_codes, dnxhd_1235_dc_bits, dnxhd_1235_ac_codes, dnxhd_1235_ac_bits, dnxhd_1235_ac_level, dnxhd_1235_ac_flags, |