diff options
| author | Chris Rankin <rankincj@yahoo.com> | 2011-09-10 21:10:54 +0100 |
|---|---|---|
| committer | Chris Rankin <rankincj@yahoo.com> | 2011-09-10 21:10:54 +0100 |
| commit | 965ea6e948e8648433c507b11f2fa36d20758ee1 (patch) | |
| tree | ccd61065b07d2aa7832d1c2562434d7b6815fbd6 | |
| parent | ebfebb80c45a283ebaeb09a1ac136810307c5e34 (diff) | |
| download | xine-lib-965ea6e948e8648433c507b11f2fa36d20758ee1.tar.gz xine-lib-965ea6e948e8648433c507b11f2fa36d20758ee1.tar.bz2 | |
Optimise flags usage.
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 14a908d2f..5ff0ce70e 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -128,10 +128,9 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) int out; audio_buffer_t *audio_buffer; int bytes_to_send; - unsigned int codec_type = buf->type & 0xFFFF0000; + unsigned int codec_type = buf->type & (BUF_MAJOR_MASK | BUF_DECODER_MASK); - if ( (buf->decoder_flags & BUF_FLAG_HEADER) && - !(buf->decoder_flags & BUF_FLAG_SPECIAL) ) { + if ( (buf->decoder_flags & (BUF_FLAG_HEADER | BUF_FLAG_SPECIAL)) == BUF_FLAG_HEADER ) { /* accumulate init data */ ff_audio_ensure_buffer_size(this, this->size + buf->size); |