diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-10-08 15:36:57 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-10-08 15:36:57 +0000 |
| commit | 2e85b344f737ab90edf32de3669bd2528fbc10ed (patch) | |
| tree | c4eaaa18b90cb91e7dc9caafe02f744c5de7d492 /libavcodec | |
| parent | 68bc33fa9fe3d5ca56884b605383b9fbdd328b72 (diff) | |
| download | ffmpeg-2e85b344f737ab90edf32de3669bd2528fbc10ed.tar.gz | |
dnxhd 36mbit support
Originally committed as revision 10689 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dnxhddata.c | 6 | ||||
| -rw-r--r-- | libavcodec/dnxhdenc.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c index 67691aec2d..2d76a623c7 100644 --- a/libavcodec/dnxhddata.c +++ b/libavcodec/dnxhddata.c @@ -281,6 +281,12 @@ const CIDEntry ff_dnxhd_cid_table[] = { dnxhd_1238_ac_codes, dnxhd_1238_ac_bits, dnxhd_1238_ac_level, dnxhd_1238_ac_run_flag, dnxhd_1238_ac_index_flag, dnxhd_1238_run_codes, dnxhd_1238_run_bits, dnxhd_1238_run }, + { 1253, 1920, 1080, 0, 188416, 188416, 4, 8, + dnxhd_1237_luma_weight, dnxhd_1237_chroma_weight, + dnxhd_1237_dc_codes, dnxhd_1237_dc_bits, + dnxhd_1237_ac_codes, dnxhd_1237_ac_bits, dnxhd_1237_ac_level, + dnxhd_1237_ac_run_flag, dnxhd_1237_ac_index_flag, + dnxhd_1237_run_codes, dnxhd_1237_run_bits, dnxhd_1237_run }, }; int ff_dnxhd_get_cid_table(int cid) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 8f73608b28..3daa46b856 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -181,6 +181,8 @@ static int dnxhd_encode_init(AVCodecContext *avctx) ctx->cid = 1237; else if (avctx->bit_rate == 185000000) ctx->cid = 1238; + else if (avctx->bit_rate == 36000000) + ctx->cid = 1253; } if (!ctx->cid || avctx->width != 1920 || avctx->height != 1080 || avctx->pix_fmt != PIX_FMT_YUV422P) { av_log(avctx, AV_LOG_ERROR, "video parameters incompatible with DNxHD\n"); |