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

Michael Niedermayer git at videolan.org
Sun May 6 01:43:49 CEST 2012


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 21 19:41:54 2012 +0200| [a4846943a3566723976ecd67a57f381b76e80e29] | 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>
(cherry picked from commit 13381577d181fa732d6d2fa0491fa2ff50186546)

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

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

diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index f01e0aa..e7402f7 100644
--- a/libavformat/xmv.c
+++ b/libavformat/xmv.c
@@ -300,7 +300,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