diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 21:24:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-18 21:24:35 +0100 |
| commit | ee648903f5e65b6f17f12326d2c50310a993be87 (patch) | |
| tree | c6cdb5818bb46eb76d58c593a3ff5e351052ae03 /libavcodec | |
| parent | b3818c47d8ba3cdae5e924afde797123352ce2a5 (diff) | |
| parent | 7a5356c7281d39ee168bfa984ae081969e47da27 (diff) | |
| download | ffmpeg-ee648903f5e65b6f17f12326d2c50310a993be87.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dcadec.c | 4 |
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; |