virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavf/concatdec: remove unrelated change during codecpar merge.

Browse Source 
Clearing the extradata is not related to the codecpar change,
and it breaks if auto_convert is disabled.

Fix trac ticket #5461.
This commit is contained in:
Nicolas George
2016-04-24 14:01:18 +02:00
parent f8d1bb2f2c
commit b8fa374fb6
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/concatdec.c
View File

@@ -182,11 +182,6 @@ static int copy_stream_props(AVStream *st, AVStream *source_st)
} }
if ((ret = avcodec_parameters_copy(st->codecpar, source_st->codecpar)) < 0) if ((ret = avcodec_parameters_copy(st->codecpar, source_st->codecpar)) < 0)
return ret; return ret;
/* We don't want to carry around MP4-style extradata, since we are usoign a bsf anyway. */
if (st->codecpar->codec_id == AV_CODEC_ID_H264) {
av_freep(&st->codecpar->extradata);
st->codecpar->extradata_size = 0;
}
st->r_frame_rate = source_st->r_frame_rate; st->r_frame_rate = source_st->r_frame_rate;
st->avg_frame_rate = source_st->avg_frame_rate; st->avg_frame_rate = source_st->avg_frame_rate;
st->time_base = source_st->time_base; st->time_base = source_st->time_base;