Merge commit '5c4b98de4d101ea715ef86847306a510afd0db0c'

[ffmpeg] / libavcodec / dcadec.c

diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 548a5f997838e453bcc321fbd8431e9edf7eb780..0339eef34063bdbabee6dd3de2e3ef715e7030a1 100644 (file)
--- 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;