mirror of https://github.com/mpv-player/mpv
now any audio stream can be chosen during DEMUXER_CTRL_SWITCH_AUDIO, irrispective of the codec used
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18683 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
8cb1b33222
commit
3253df6f12
|
@ -838,18 +838,14 @@ int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){
|
||||||
for (i = 0; i < mpg_d->num_a_streams; i++) {
|
for (i = 0; i < mpg_d->num_a_streams; i++) {
|
||||||
if (d_audio->id == mpg_d->a_stream_ids[i]) break;
|
if (d_audio->id == mpg_d->a_stream_ids[i]) break;
|
||||||
}
|
}
|
||||||
do {
|
|
||||||
i = (i+1) % mpg_d->num_a_streams;
|
i = (i+1) % mpg_d->num_a_streams;
|
||||||
sh_a = (sh_audio_t*)demuxer->a_streams[mpg_d->a_stream_ids[i]];
|
sh_a = (sh_audio_t*)demuxer->a_streams[mpg_d->a_stream_ids[i]];
|
||||||
} while (sh_a->format != sh_audio->format);
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
for (i = 0; i < mpg_d->num_a_streams; i++)
|
for (i = 0; i < mpg_d->num_a_streams; i++)
|
||||||
if (*((int*)arg) == mpg_d->a_stream_ids[i]) break;
|
if (*((int*)arg) == mpg_d->a_stream_ids[i]) break;
|
||||||
if (i < mpg_d->num_a_streams)
|
if (i < mpg_d->num_a_streams)
|
||||||
sh_a = (sh_audio_t*)demuxer->a_streams[*((int*)arg)];
|
sh_a = (sh_audio_t*)demuxer->a_streams[*((int*)arg)];
|
||||||
if (sh_a->format != sh_audio->format)
|
|
||||||
i = mpg_d->num_a_streams;
|
|
||||||
}
|
}
|
||||||
if (i < mpg_d->num_a_streams && d_audio->id != mpg_d->a_stream_ids[i]) {
|
if (i < mpg_d->num_a_streams && d_audio->id != mpg_d->a_stream_ids[i]) {
|
||||||
d_audio->id = mpg_d->a_stream_ids[i];
|
d_audio->id = mpg_d->a_stream_ids[i];
|
||||||
|
|
Loading…
Reference in New Issue