generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2015-03-18 21:24:31 +01:00
commit ee648903f5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dcadec.c
View File

@ -1472,7 +1472,6 @@ static int dca_decode_frame(AVCodecContext *avctx, void *data,
} }
// set AVCodec values with parsed data // set AVCodec values with parsed data
avctx->sample_rate = s->sample_rate; avctx->sample_rate = s->sample_rate;
avctx->bit_rate = s->bit_rate;
s->profile = FF_PROFILE_DTS; s->profile = FF_PROFILE_DTS;
@ -1937,6 +1936,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (ret < 0) if (ret < 0)
return ret; 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; *got_frame_ptr = 1;
return buf_size; return buf_size;

5
libavformat/matroskaenc.c
View File

@ -605,8 +605,9 @@ static int mkv_write_native_codecprivate(AVFormatContext *s,
return ff_isom_write_avcc(dyn_cp, codec->extradata, return ff_isom_write_avcc(dyn_cp, codec->extradata,
codec->extradata_size); codec->extradata_size);
case AV_CODEC_ID_HEVC: case AV_CODEC_ID_HEVC:
return ff_isom_write_hvcc(dyn_cp, codec->extradata, ff_isom_write_hvcc(dyn_cp, codec->extradata,
codec->extradata_size, 0); codec->extradata_size, 0);
return 0;
case AV_CODEC_ID_ALAC: case AV_CODEC_ID_ALAC:
if (codec->extradata_size < 36) { if (codec->extradata_size < 36) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,