aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-03-18 20:34:35 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2015-03-18 20:34:35 +0100
commit7f1ea38868e9d1e4f9814cc34ce7d50e38aa93fc (patch)
treeb30f4e40f8f7855c5326538af3f9943f45630530
parentc59654d67d1afde3fac24021ef0fd9d18cf38455 (diff)
downloadffmpeg-7f1ea38868e9d1e4f9814cc34ce7d50e38aa93fc.tar.gz
lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.
Fixes ticket #4375. Reviewed-by: Hendrik Leppkes
-rw-r--r--libavcodec/dcadec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/dcadec.c b/libavcodec/dcadec.c
index 548a5f9978..0339eef340 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;