[FFmpeg-cvslog] lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.

Carl Eugen Hoyos git at videolan.org
Wed Mar 18 21:39:04 CET 2015


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Mar 18 20:34:35 2015 +0100| [7f1ea38868e9d1e4f9814cc34ce7d50e38aa93fc] | committer: Carl Eugen Hoyos

lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.

Fixes ticket #4375.

Reviewed-by: Hendrik Leppkes

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7f1ea38868e9d1e4f9814cc34ce7d50e38aa93fc
---

 libavcodec/dcadec.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 548a5f9..0339eef 100644
--- a/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@ -1472,7 +1472,6 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
     }
     // set AVCodec values with parsed data
     avctx->sample_rate = s->sample_rate;
-    avctx->bit_rate    = s->bit_rate;
 
     s->profile = FF_PROFILE_DTS;
 
@@ -1937,6 +1936,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
     if (ret < 0)
         return ret;
 
+    if (   avctx->profile != FF_PROFILE_DTS_HD_MA
+        && avctx->profile != FF_PROFILE_DTS_HD_HRA)
+        avctx->bit_rate = s->bit_rate;
     *got_frame_ptr = 1;
 
     return buf_size;



More information about the ffmpeg-cvslog mailing list