# HG changeset patch # User reimar # Date 1164999104 0 # Node ID 896a8210ed9fa5f6157c5e533a498c6cf96d4a30 # Parent c91294804a0b62b8287a9572c15b3b685c129dc4 Make sure we do not hang if no streams are available diff -r c91294804a0b -r 896a8210ed9f libmpdemux/demux_avi.c --- a/libmpdemux/demux_avi.c Fri Dec 01 17:57:29 2006 +0000 +++ b/libmpdemux/demux_avi.c Fri Dec 01 18:51:44 2006 +0000 @@ -775,9 +775,13 @@ 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;