diff options
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/concatdec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 7748c20b6d..5d4f67d0ac 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -181,8 +181,9 @@ static int copy_stream_props(AVStream *st, AVStream *source_st) if (ret < 0) return ret; } - memcpy(st->codecpar->extradata, source_st->codecpar->extradata, - source_st->codecpar->extradata_size); + if (source_st->codecpar->extradata_size) + memcpy(st->codecpar->extradata, source_st->codecpar->extradata, + source_st->codecpar->extradata_size); return 0; } if ((ret = avcodec_parameters_copy(st->codecpar, source_st->codecpar)) < 0) |