avformat/utils: factorize if()
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 16:02:42 +0000 (18:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Apr 2014 16:02:42 +0000 (18:02 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c

index 685a5fe..768acd4 100644 (file)
@@ -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,