[FFmpeg-cvslog] xmvdemux: dont let current_stream become invalid.

Michael Niedermayer git at videolan.org
Sat Apr 21 19:55:22 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 21 19:41:54 2012 +0200| [13381577d181fa732d6d2fa0491fa2ff50186546] | committer: Michael Niedermayer

xmvdemux: dont let current_stream become invalid.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/xmv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index 596da5f..73c666d 100644
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -304,7 +304,7 @@ static int xmv_process_packet_header(AVFormatContext *s)
     xmv->current_stream = 0;
     if (!xmv->video.frame_count) {
         xmv->video.frame_count = 1;
-        xmv->current_stream    = 1;
+        xmv->current_stream    = xmv->stream_count > 1;
     }
 
     /* Packet audio header */



More information about the ffmpeg-cvslog mailing list