diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2019-09-23 23:23:10 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-02 21:38:12 +0200 |
| commit | 9f011f0876b1bb1fba0f776539a98e71f5315dd6 (patch) | |
| tree | f35d9e39b0731894c84b4758b3ca097acc9244fb | |
| parent | 955be73bc5fc9edf42581f67e441378577161b2b (diff) | |
| download | ffmpeg-9f011f0876b1bb1fba0f776539a98e71f5315dd6.tar.gz | |
avformat/webmdashenc: Don't pass NULL to memcmp
Affects the FATE-tests webm-dash-manifest-unaligned-video-streams,
webm-dash-manifest and webm-dash-manifest-representations.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit a42c47b77feda837a966aa96569ed8a2553b1c36)
| -rw-r--r-- | libavformat/webmdashenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/webmdashenc.c b/libavformat/webmdashenc.c index 332d0466e1..1304c1a8c3 100644 --- a/libavformat/webmdashenc.c +++ b/libavformat/webmdashenc.c @@ -155,7 +155,8 @@ static int bitstream_switching(AVFormatContext *s, const AdaptationSet *as) !av_strstart(track_num->value, gold_track_num->value, NULL) || gold_par->codec_id != par->codec_id || gold_par->extradata_size != par->extradata_size || - memcmp(gold_par->extradata, par->extradata, par->extradata_size)) { + (par->extradata_size > 0 && + memcmp(gold_par->extradata, par->extradata, par->extradata_size))) { return 0; } } |