[FFmpeg-soc] [soc]: r2934 - aac/aac.c

[superdump]

Author: superdump
Date: Wed Jul 30 18:09:35 2008
New Revision: 2934

Log:
Rename output_samples() as mixdown_and_convert_to_int16()


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Wed Jul 30 18:09:35 2008
@@ -2177,7 +2177,7 @@ static int spectral_to_sample(AACContext
  * @param   data_size   output data size in bytes
  * @return  Returns error status. 0 - OK, !0 - error
  */
-static int output_samples(AVCodecContext * avccontext, uint16_t * data, int * data_size) {
+static int mixdown_and_convert_to_int16(AVCodecContext * avccontext, uint16_t * data, int * data_size) {
     AACContext * ac = avccontext->priv_data;
     int i;
     float *c, *l, *r, *sl, *sr, *out;
@@ -2314,7 +2314,7 @@ static int aac_decode_frame(AVCodecConte
 
     if((err = spectral_to_sample(ac)))
         return err;
-    if((err = output_samples(avccontext, data, data_size)))
+    if((err = mixdown_and_convert_to_int16(avccontext, data, data_size)))
         return err;
 
     return buf_size;