avformat/utils: factorize if()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · c0d62d999d
parent 289f02f923
commit c0d62d999d
1 changed files with 3 additions and 3 deletions
--- 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,