From f32179337ef0cdbb4c8a522cd8760ac5ba1158a0 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Fri, 1 Dec 2006 18:51:44 +0000
Subject: Make sure we do not hang if no streams are available

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21420 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpdemux/demux_avi.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'libmpdemux/demux_avi.c')

diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index d6053e878b..50872fafe7 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -775,9 +775,13 @@ static int demux_avi_control(demuxer_t *demuxer,int cmd, void *arg){
 	    if (*(int *)arg >= 0)
 	      ds->id = *(int *)arg;
 	    else {
+	      int id = ds->id;
 	      do {
-	        if (++ds->id >= maxid) ds->id = 0;
-	      } while (!streams[ds->id]);
+	        if (++id >= maxid) id = 0;
+	        if (id == ds->id) // no streams available
+	          return DEMUXER_CTRL_NOTIMPL;
+	      } while (!streams[id]);
+	      ds->id = id;
 	    }
 
 	    chunkid = (ds->id / 10 + '0') | (ds->id % 10 + '0') << 8;
-- 
cgit v1.2.3