diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-08-21 04:39:52 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-08-21 04:39:52 +0100 |
| commit | 141558ac76e39d7f39400da0ecb6ca1f92ffee22 (patch) | |
| tree | 4f800af1614d7fc998034dc9e7f58d877c154b10 /src/xine-engine/audio_decoder.c | |
| parent | bc19407410f6467638888f917f9e7832f6eaee28 (diff) | |
| parent | cbd017c8bc0139311d149c58fabba4e783dd95a9 (diff) | |
| download | xine-lib-141558ac76e39d7f39400da0ecb6ca1f92ffee22.tar.gz xine-lib-141558ac76e39d7f39400da0ecb6ca1f92ffee22.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src/xine-engine/audio_decoder.c')
| -rw-r--r-- | src/xine-engine/audio_decoder.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index 549c19b02..c271fc6fc 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.c @@ -253,6 +253,7 @@ static void *audio_decoder_loop (void *stream_gen) { uint32_t audio_type = 0; int i,j; + uint32_t chan=buf->type&0x0000FFFF; /* printf("audio_decoder: buf_type=%08x auto=%08x user=%08x\n", @@ -264,11 +265,11 @@ static void *audio_decoder_loop (void *stream_gen) { /* update track map */ i = 0; - while ( (i<stream->audio_track_map_entries) && (stream->audio_track_map[i]<buf->type) ) + while ( (i<stream->audio_track_map_entries) && ((stream->audio_track_map[i]&0x0000FFFF)<chan) ) i++; if ( (i==stream->audio_track_map_entries) - || (stream->audio_track_map[i] != buf->type) ) { + || ((stream->audio_track_map[i]&0x0000FFFF)!=chan) ) { xine_event_t ui_event; j = stream->audio_track_map_entries; |