[SCM] libav/experimental: dnxhd 36mbit support

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2e85b344f737ab90edf32de3669bd2528fbc10ed
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Oct 8 15:36:57 2007 +0000

    dnxhd 36mbit support
    
    Originally committed as revision 10689 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dnxhddata.c b/libavcodec/dnxhddata.c
index 67691ae..2d76a62 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 8f73608..3daa46b 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");

-- 
Libav/FFmpeg packaging