[FFmpeg-cvslog] avformat/xmv: factor return check out of if/else

[Michael Niedermayer]

ffmpeg | branch: release/2.5 | Michael Niedermayer <michael at niedermayer.cc> | Fri Nov  6 02:11:01 2015 +0100| [46cece74c31a0badd9e3100189ab92fe15da8302] | committer: Michael Niedermayer

avformat/xmv: factor return check out of if/else

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 9b6fac11da470274d4b93d46ef66527aa1824179)

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46cece74c31a0badd9e3100189ab92fe15da8302
---

 libavformat/xmv.c |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index 6eac4d2..cee2c80 100644
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -547,16 +547,14 @@ static int xmv_read_packet(AVFormatContext *s,
         /* Fetch a video frame */
 
         result = xmv_fetch_video_packet(s, pkt);
-        if (result)
-            return result;
-
     } else {
         /* Fetch an audio frame */
 
         result = xmv_fetch_audio_packet(s, pkt, xmv->current_stream - 1);
-        if (result)
-            return result;
     }
+    if (result)
+        return result;
+
 
     /* Increase our counters */
     if (++xmv->current_stream >= xmv->stream_count) {