[vlc-commits] commit: Revert "Avoid warnings" ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Apr 16 17:11:53 2010 +0300| [434800aa5b94d683a290528ee92d6358c4eaf31d] | committer: Rémi Denis-Courmont 

Revert "Avoid warnings"

This reverts commit 3e7d1bbda8aa1ef38678b0f60934d1c273ba1107.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.0.git/?a=commit;h=434800aa5b94d683a290528ee92d6358c4eaf31d
---

 modules/codec/a52.c |   11 +++--------
 modules/codec/dts.c |   11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/modules/codec/a52.c b/modules/codec/a52.c
index a33f3c0..fe808fc 100644
--- a/modules/codec/a52.c
+++ b/modules/codec/a52.c
@@ -100,7 +100,7 @@ enum {
 static void *DecodeBlock  ( decoder_t *, block_t ** );
 
 static uint8_t       *GetOutBuffer ( decoder_t *, block_t ** );
-static block_t       *GetAoutBuffer( decoder_t * );
+static aout_buffer_t *GetAoutBuffer( decoder_t * );
 static block_t       *GetSoutBuffer( decoder_t * );
 
 /*****************************************************************************
@@ -381,7 +381,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
     }
     else
     {
-        block_t *p_aout_buffer = GetAoutBuffer( p_dec );
+        aout_buffer_t *p_aout_buffer = GetAoutBuffer( p_dec );
         p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL;
         *pp_out_buffer = p_aout_buffer;
     }
@@ -392,7 +392,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
 /*****************************************************************************
  * GetAoutBuffer:
  *****************************************************************************/
-static block_t *GetAoutBuffer( decoder_t *p_dec )
+static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     aout_buffer_t *p_buf;
@@ -403,12 +403,7 @@ static block_t *GetAoutBuffer( decoder_t *p_dec )
     p_buf->start_date = aout_DateGet( &p_sys->end_date );
     p_buf->end_date = aout_DateIncrement( &p_sys->end_date, p_sys->frame.i_samples );
 
-#if 0
     return p_buf;
-#else
-    decoder_DeleteAudioBuffer( p_dec, p_buf );
-    return NULL;
-#endif
 }
 
 /*****************************************************************************
diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index d47b41a..f8f64eb 100644
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -109,7 +109,7 @@ static int  SyncInfo( const uint8_t *, bool *, unsigned int *, unsigned int *,
                       unsigned int *, unsigned int *, unsigned int * );
 
 static uint8_t       *GetOutBuffer ( decoder_t *, block_t ** );
-static block_t       *GetAoutBuffer( decoder_t * );
+static aout_buffer_t *GetAoutBuffer( decoder_t * );
 static block_t       *GetSoutBuffer( decoder_t * );
 
 /*****************************************************************************
@@ -395,7 +395,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
     }
     else
     {
-        block_t *p_aout_buffer = GetAoutBuffer( p_dec );
+        aout_buffer_t *p_aout_buffer = GetAoutBuffer( p_dec );
         p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL;
         *pp_out_buffer = p_aout_buffer;
     }
@@ -406,7 +406,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer )
 /*****************************************************************************
  * GetAoutBuffer:
  *****************************************************************************/
-static block_t *GetAoutBuffer( decoder_t *p_dec )
+static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec )
 {
     decoder_sys_t *p_sys = p_dec->p_sys;
     aout_buffer_t *p_buf;
@@ -422,12 +422,7 @@ static block_t *GetAoutBuffer( decoder_t *p_dec )
     p_buf->end_date =
         aout_DateIncrement( &p_sys->end_date, p_sys->i_frame_length );
 
-#if 0
     return p_buf;
-#else
-    decoder_DeleteAudioBuffer( p_dec, p_buf );
-    return NULL;
-#endif
 }
 
 /*****************************************************************************