Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2016-09-19 03:21:10 +0300
committerPaul B Mahol <onemda@gmail.com>2016-09-19 03:33:58 +0300
commitd38dff8e5da54b67c257d05fe7689d49a3a745e8 (patch)
treea2bd220bb7c9bf61e7d3c6145f48df7865056766 /libavcodec/dnxhddata.c
parent6216b4780b16c0994e0ee4bcd1f354f35f674856 (diff)
avcodec/dnxhddata: add support for cid 1244
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/dnxhddata.c')
-rw-r--r--libavcodec/dnxhddata.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index 2011829a06..4462df3c2a 100644
--- a/libavcodec/dnxhddata.c
+++ b/libavcodec/dnxhddata.c
@@ -233,6 +233,7 @@ static const uint8_t dnxhd_1252_chroma_weight[] = {
114, 128, 125, 129, 134, 125, 116, 116,
};
+/* Used in CID 1244, 1260 */
static const uint8_t dnxhd_1260_luma_weight[] = {
0, 32, 33, 34, 36, 37, 37, 36,
34, 33, 34, 35, 37, 38, 40, 41,
@@ -244,6 +245,7 @@ static const uint8_t dnxhd_1260_luma_weight[] = {
52, 53, 53, 50, 50, 54, 54, 54,
};
+/* Used in CID 1244, 1260 */
static const uint8_t dnxhd_1260_chroma_weight[] = {
0, 32, 34, 38, 42, 40, 38, 36,
35, 35, 38, 42, 43, 43, 42, 40,
@@ -979,6 +981,14 @@ const CIDEntry ff_dnxhd_cid_table[] = {
dnxhd_1235_run_codes, dnxhd_1235_run_bits, dnxhd_1238_run,
{ 185, 220 },
{ { 25, 1 }, { 30000, 1001 } } },
+ { 1244, 1440, 1080, 606208, 303104,
+ DNXHD_INTERLACED, 4, 8, 3,
+ dnxhd_1260_luma_weight, dnxhd_1260_chroma_weight,
+ dnxhd_1237_dc_codes, dnxhd_1237_dc_bits,
+ dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_info,
+ dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run,
+ { 120, 145 },
+ { { 25, 1 }, { 30000, 1001 } } },
{ 1250, 1280, 720, 458752, 458752,
0, 6, 10, 4,
dnxhd_1250_luma_weight, dnxhd_1250_chroma_weight,