diff options
| author | Nicolas George <george@nsup.org> | 2016-04-24 14:01:18 +0200 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2016-04-26 16:58:59 +0200 |
| commit | b8fa374fb6eba995a9d5dd50f714f9faff43b81b (patch) | |
| tree | dc5b1fe9c41f85602d7e3ab0521e9b5c4172fe76 /libavformat/concatdec.c | |
| parent | f8d1bb2f2ce9031940019e1cda4d30bc409ee349 (diff) | |
| download | ffmpeg-b8fa374fb6eba995a9d5dd50f714f9faff43b81b.tar.gz | |
lavf/concatdec: remove unrelated change during codecpar merge.
Clearing the extradata is not related to the codecpar change,
and it breaks if auto_convert is disabled.
Fix trac ticket #5461.
Diffstat (limited to 'libavformat/concatdec.c')
| -rw-r--r-- | libavformat/concatdec.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index e3418e18e8..b2bab55f70 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -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) 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->avg_frame_rate = source_st->avg_frame_rate; st->time_base = source_st->time_base; |