Merge commit '5b70fb8fee4af3b13f29a2dc7222fd3c9782f79b'

[ffmpeg] / libavformat / xmv.c

diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index 45c24642cc042683831f23a63a235cbf29161a7c..14d007a3e0b81f644ef82c78519f3a4e8dd57fe7 100644 (file)
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -549,16 +549,17 @@ 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) {
+        xmv->current_stream = 0;
+        xmv->video.current_frame = xmv->video.frame_count;
+        return result;
+    }
+
 
     /* Increase our counters */
     if (++xmv->current_stream >= xmv->stream_count) {