RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-17 20:48:46 +00:00
Code Issues Releases Wiki Activity

Support switching to/from nosound in demux_lavf.

Browse Source 
Also fixes a bug when pstreams[-1] could be accessed. It happens when
switching audio tracks if mplayer was run with '-nosound'.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26126 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
eugeni 2008-02-29 17:25:57 +00:00
parent 522ee6b783
commit 36277e690e
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libmpdemux/demux_lavf.c
View File

@ -665,7 +665,7 @@ static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
{
int id = *((int*)arg);
int newid = -2;
int i, curridx = -2;
int i, curridx = -1;
int nstreams, *pstreams;
demux_stream_t *ds;
@ -681,14 +681,6 @@ static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
nstreams = priv->audio_streams;
pstreams = priv->astreams;
}
if(id == -2)
{
if(ds->id >= 0)
priv->avfc->streams[ds->id]->discard = AVDISCARD_ALL;
ds_free_packs(ds);
*((int*)arg) = ds->id = -2;
return DEMUXER_CTRL_OK;
}
for(i = 0; i < nstreams; i++)
{
if(pstreams[i] == ds->id) //current stream id
@ -698,12 +690,14 @@ static int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg)
}
}
if(id < 0)
{
i = (curridx + 1) % nstreams;
if(id == -2) { // no sound
i = -1;
} else if(id == -1) { // next track
i = (curridx + 2) % (nstreams + 1) - 1;
if (i >= 0)
newid = pstreams[i];
}
else
else // select track by id
{
for(i = 0; i < nstreams; i++)
{