RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/nutenc: Do not pass NULL to memcmp() in get_needed_flags() 

This compared to the other suggestions is cleaner and easier to understand
keeping the condition in the if() simple.

This affects alot of fate tests.

See: [FFmpeg-devel] [PATCH 05/11] avformat/nutenc: Don't pass NULL to memcmp
See: [FFmpeg-devel] [PATCH]lavf/nutenc: Do not call memcmp() with NULL argument

Fixes: Ticket 7980

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-11-01 10:02:29 +01:00
parent 377fa6612a
commit e4fdeb3fce
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/nutenc.c
View File

@ -792,11 +792,12 @@ static int get_needed_flags(NUTContext *nut, StreamContext *nus, FrameCode *fc,
flags |= FLAG_CHECKSUM; flags |= FLAG_CHECKSUM;
if (FFABS(pkt->pts - nus->last_pts) > nus->max_pts_distance) if (FFABS(pkt->pts - nus->last_pts) > nus->max_pts_distance)
flags |= FLAG_CHECKSUM; flags |= FLAG_CHECKSUM;
if (pkt->size < nut->header_len[fc->header_idx] || if (fc->header_idx)
(pkt->size > 4096 && fc->header_idx) || if (pkt->size < nut->header_len[fc->header_idx] ||
memcmp(pkt->data, nut->header[fc->header_idx], pkt->size > 4096 ||
nut->header_len[fc->header_idx])) memcmp(pkt->data, nut->header [fc->header_idx],
flags |= FLAG_HEADER_IDX; nut->header_len[fc->header_idx]))
flags |= FLAG_HEADER_IDX;
return flags | (fc->flags & FLAG_CODED); return flags | (fc->flags & FLAG_CODED);
} }