[xine-devel] [PATCH 2 of 6] Optimise flags usage

[Chris R. <ran...@ya...>]

# HG changeset patch
# User Chris Rankin <ran...@ya...>
# Date 1315685454 -3600
# Node ID d15be0f3d4818efe48813143e433714466db57bd
# Parent  d9c01a4fd39ea6f360daa98f94e4a554f0a873b1
Optimise flags usage.

diff -r d9c01a4fd39e -r d15be0f3d481 src/combined/ffmpeg/ff_audio_decoder.c
--- a/src/combined/ffmpeg/ff_audio_decoder.c	Sat Sep 10 21:07:08 2011 +0100
+++ b/src/combined/ffmpeg/ff_audio_decoder.c	Sat Sep 10 21:10:54 2011 +0100
@@ -128,10 +128,9 @@
   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);