diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-15 23:18:04 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-11-15 23:18:04 +0000 |
| commit | 9635738cc349e37e76f23a4d99eda696197cb715 (patch) | |
| tree | c77eaa18c0a85983252dd7f5ef5bbba04e18a015 /src/xine-engine/video_decoder.c | |
| parent | 230d3c07ef6fca8fb08ae8f14235c56b535d7e64 (diff) | |
| download | xine-lib-9635738cc349e37e76f23a4d99eda696197cb715.tar.gz xine-lib-9635738cc349e37e76f23a4d99eda696197cb715.tar.bz2 | |
improved audio/spu channel selection, let the user take control over both if he/she wants to
CVS patchset: 1047
CVS date: 2001/11/15 23:18:04
Diffstat (limited to 'src/xine-engine/video_decoder.c')
| -rw-r--r-- | src/xine-engine/video_decoder.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index 20a59d96b..87ca1a956 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.63 2001/11/13 21:47:59 heikos Exp $ + * $Id: video_decoder.c,v 1.64 2001/11/15 23:18:04 guenter Exp $ * */ @@ -145,7 +145,9 @@ void *video_decoder_loop (void *this_gen) { break; case BUF_CONTROL_SPU_CHANNEL: - this->spu_channel = buf->decoder_info[0]; + this->spu_channel_auto = buf->decoder_info[0]; + if (this->spu_channel_user == -1) + this->spu_channel = this->spu_channel_auto; break; case BUF_CONTROL_END: |