aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/xmv.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-21 19:41:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-06 00:53:02 +0200
commita4846943a3566723976ecd67a57f381b76e80e29 (patch)
tree1d1187cadd03ed9269319f60a99a913a87ae6a05 /libavformat/xmv.c
parentbf2534a5e2d57498dc663b1f49f85521e5ab9235 (diff)
downloadffmpeg-a4846943a3566723976ecd67a57f381b76e80e29.tar.gz
xmvdemux: dont let current_stream become invalid.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 13381577d181fa732d6d2fa0491fa2ff50186546)
Diffstat (limited to 'libavformat/xmv.c')
-rw-r--r--libavformat/xmv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/xmv.c b/libavformat/xmv.c
index f01e0aa77b..e7402f7a4a 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 */