omxil: get rid of debug ifdefs

[vlc] / modules / codec / flac.c

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 9552acc85910d9d10be27eb5a2edf5dda5ce8311..b2ee916ab8ce3f6c6632e8eb58d0a1b8ff5dffc8 100644 (file)
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -134,7 +134,12 @@ static void Interleave( int32_t *p_out, const int32_t * const *pp_in,
 
     for( unsigned j = 0; j < i_samples; j++ )
         for( unsigned i = 0; i < i_nb_channels; i++ )
-            p_out[j * i_nb_channels + i] = pp_in[pi_index[i]][j] << shift;
+        {
+            union { int32_t i; uint32_t u; } spl;
+
+            spl.u = ((uint32_t)pp_in[pi_index[i]][j]) << shift;
+            p_out[j * i_nb_channels + i] = spl.i;
+        }
 }
 
 /*****************************************************************************
@@ -389,7 +394,7 @@ static void ProcessHeader( decoder_t *p_dec )
 
     if (i_extra > 42 && !memcmp(p_dec->fmt_in.p_extra, header, 4))
         i_extra = 42;
-    else if (i_extra > 34 && !memcmp(p_dec->fmt_in.p_extra, header, 4))
+    else if (i_extra > 34 && memcmp(p_dec->fmt_in.p_extra, header, 4))
         i_extra = 34;
 
     switch (i_extra) {
@@ -592,7 +597,7 @@ EncoderWriteCallback( const FLAC__StreamEncoder *encoder,
             ((uint8_t*)p_enc->fmt_out.p_extra)[4] |= 0x80;
         }
         p_sys->i_headers++;
-        return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+        return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
     }
 
     p_block = block_Alloc( bytes );
@@ -610,7 +615,7 @@ EncoderWriteCallback( const FLAC__StreamEncoder *encoder,
 
     block_ChainAppend( &p_sys->p_chain, p_block );
 
-    return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+    return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
 }
 /*****************************************************************************
  * EncoderMetadataCallback: called by libflac to output metadata