[FFmpeg-devel] [PATCH] lavf/concatdec: remove unrelated change during codecpar merge.
Nicolas George
george at nsup.org
Sun Apr 24 16:39:32 CEST 2016
Clearing the extradata is not related to the codecpar change,
and it breaks if auto_convert is disabled.
Fix trac ticket #5461.
Signed-off-by: Nicolas George <george at nsup.org>
---
libavformat/concatdec.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index e3418e1..b2bab55 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;
--
2.8.0.rc3
More information about the ffmpeg-devel
mailing list