On Fri, Nov 1, 2019 at 10:42 AM Michael Niedermayer <mich...@niedermayer.cc> wrote:
> This compared to the other suggestions is cleaner and easer to understand > keeping the condition in the if() simple > > See: [FFmpeg-devel] [PATCH] avformat/nutenc: Fix memleak > See: [FFmpeg-devel] [PATCH]lavf/nutenc: Do not call memcmp() with NULL > argument > > Fixes: Ticket 7980 > > Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > --- > libavformat/nutenc.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c > index d212f0c245..46dce7722d 100644 > --- a/libavformat/nutenc.c > +++ b/libavformat/nutenc.c > @@ -792,11 +792,12 @@ static int get_needed_flags(NUTContext *nut, > StreamContext *nus, FrameCode *fc, > flags |= FLAG_CHECKSUM; > if (FFABS(pkt->pts - nus->last_pts) > nus->max_pts_distance) > flags |= FLAG_CHECKSUM; > - if (pkt->size < nut->header_len[fc->header_idx] || > - (pkt->size > 4096 && fc->header_idx) || > - memcmp(pkt->data, nut->header[fc->header_idx], > - nut->header_len[fc->header_idx])) > - flags |= FLAG_HEADER_IDX; > + if (fc->header_idx) > + if (pkt->size < nut->header_len[fc->header_idx] || > + pkt->size > 4096 || > + memcmp(pkt->data, nut->header [fc->header_idx], > + nut->header_len[fc->header_idx])) > + flags |= FLAG_HEADER_IDX; > > return flags | (fc->flags & FLAG_CODED); > } > -- > 2.23.0 > > The reference to [FFmpeg-devel] [PATCH] avformat/nutenc: Fix memleak is inappropriate. Carl's patch was titled "[FFmpeg-devel] lavf/nutenc: Do not call memcmp() with NULL argument". You could also mention that this affected lots of fate-tests. And "easer" is missing an "i". I have no objections apart from that. I didn't test your code, but it looks fine. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
