From c0d62d999d0ecf072b6352f346b7e17841f2598c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 13 Apr 2014 18:02:42 +0200 Subject: [PATCH] avformat/utils: factorize if() Signed-off-by: Michael Niedermayer --- libavformat/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 685a5fe752..768acd4be0 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1545,10 +1545,10 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt) } st->global_side_data_injected = 1; } - } - if (ret >= 0 && !(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA)) - av_packet_merge_side_data(pkt); + if (!(s->flags & AVFMT_FLAG_KEEP_SIDE_DATA)) + av_packet_merge_side_data(pkt); + } if (s->debug & FF_FDEBUG_TS) av_log(s, AV_LOG_DEBUG,