diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-08-23 20:18:22 +0100 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2011-08-23 20:18:22 +0100 |
commit | b097a80fb2d9100e02f2fdaf62fe3d408f73763f (patch) | |
tree | 930fda0d620d73f453e7be7eb51aad28de3395cf /src/xine-engine/audio_decoder.c | |
parent | 53ec0b8ab9e7076d84221bbd5ea84978239a1afc (diff) | |
parent | edb68926aced0739f3e62ea2501bc32326c02f86 (diff) | |
download | xine-lib-b097a80fb2d9100e02f2fdaf62fe3d408f73763f.tar.gz xine-lib-b097a80fb2d9100e02f2fdaf62fe3d408f73763f.tar.bz2 |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
rename : src/libxineadec/xine_lpcm_decoder.c => src/audio_dec/xine_lpcm_decoder.c
rename : src/libspuhdmv/xine_hdmv_decoder.c => src/spu_dec/spuhdmv_decoder.c
Diffstat (limited to 'src/xine-engine/audio_decoder.c')
-rw-r--r-- | src/xine-engine/audio_decoder.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index e2d0acd04..e36f576bd 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.c @@ -283,6 +283,9 @@ static void *audio_decoder_loop (void *stream_gen) { } stream->audio_track_map[i] = buf->type; stream->audio_track_map_entries++; + /* implicit channel change - reopen decoder below */ + if ((i == 0) && (audio_channel_user == -1) && (stream->audio_channel_auto < 0)) + stream->audio_decoder_streamtype = -1; ui_event.type = XINE_EVENT_UI_CHANNELS_CHANGED; ui_event.data_length = 0; |