diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-01 18:51:44 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-12-01 18:51:44 +0000 |
commit | f32179337ef0cdbb4c8a522cd8760ac5ba1158a0 (patch) | |
tree | f70a2475b99eb11664db475328e27b7750b585ef /libmpdemux | |
parent | d441d65f3411402a367e24cd70b606c579ef356e (diff) | |
download | mpv-f32179337ef0cdbb4c8a522cd8760ac5ba1158a0.tar.bz2 mpv-f32179337ef0cdbb4c8a522cd8760ac5ba1158a0.tar.xz |
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
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_avi.c | 8 |
1 files changed, 6 insertions, 2 deletions
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; |