[MPlayer-cvslog] r32061 - in trunk: libmpcodecs/dec_audio.c libmpcodecs/dec_audio.h mencoder.c mplayer.c

[diego]

Author: diego
Date: Wed Sep  8 01:29:49 2010
New Revision: 32061

Log:
Rename decode_audio() to mp_decode_audio().
The name clashes with the decode_audio function pointer in the
ad_functions struct.

Modified:
   trunk/libmpcodecs/dec_audio.c
   trunk/libmpcodecs/dec_audio.h
   trunk/mencoder.c
   trunk/mplayer.c

Modified: trunk/libmpcodecs/dec_audio.c
==============================================================================
--- trunk/libmpcodecs/dec_audio.c	Wed Sep  8 00:04:35 2010	(r32060)
+++ trunk/libmpcodecs/dec_audio.c	Wed Sep  8 01:29:49 2010	(r32061)
@@ -428,7 +428,7 @@ static int filter_n_bytes(sh_audio_t *sh
  * In the former case sh_audio->a_out_buffer_len is always >= minlen
  * on return. In case of EOF/error it might or might not be.
  * Can reallocate sh_audio->a_out_buffer if needed to fit all filter output. */
-int decode_audio(sh_audio_t *sh_audio, int minlen)
+int mp_decode_audio(sh_audio_t *sh_audio, int minlen)
 {
     // Indicates that a filter seems to be buffering large amounts of data
     int huge_filter_buffer = 0;

Modified: trunk/libmpcodecs/dec_audio.h
==============================================================================
--- trunk/libmpcodecs/dec_audio.h	Wed Sep  8 00:04:35 2010	(r32060)
+++ trunk/libmpcodecs/dec_audio.h	Wed Sep  8 01:29:49 2010	(r32061)
@@ -30,7 +30,7 @@ extern int fakemono;
 // dec_audio.c:
 void afm_help(void);
 int init_best_audio_codec(sh_audio_t *sh_audio, char** audio_codec_list, char** audio_fm_list);
-int decode_audio(sh_audio_t *sh_audio, int minlen);
+int mp_decode_audio(sh_audio_t *sh_audio, int minlen);
 void resync_audio_stream(sh_audio_t *sh_audio);
 void skip_audio_frame(sh_audio_t *sh_audio);
 void uninit_audio(sh_audio_t *sh_audio);

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Wed Sep  8 00:04:35 2010	(r32060)
+++ trunk/mencoder.c	Wed Sep  8 01:29:49 2010	(r32061)
@@ -301,7 +301,8 @@ static int dec_audio(sh_audio_t *sh_audi
     while(size<total && !at_eof){
 	int len=total-size;
 		if(len>MAX_OUTBURST) len=MAX_OUTBURST;
-		if (decode_audio(sh_audio, len) < 0) at_eof=1;
+		if (mp_decode_audio(sh_audio, len) < 0)
+                    at_eof = 1;
 		if(len>sh_audio->a_out_buffer_len) len=sh_audio->a_out_buffer_len;
 		fast_memcpy(buffer+size,sh_audio->a_out_buffer,len);
 		sh_audio->a_out_buffer_len-=len; size+=len;

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Wed Sep  8 00:04:35 2010	(r32060)
+++ trunk/mplayer.c	Wed Sep  8 01:29:49 2010	(r32061)
@@ -2160,7 +2160,7 @@ static int fill_audio_out_buffers(void)
 	current_module="decode_audio";
 	t = GetTimer();
 	if (!format_change) {
-	    res = decode_audio(sh_audio, playsize);
+	    res = mp_decode_audio(sh_audio, playsize);
 	    format_change = res == -2;
 	}
 	if (!format_change && res < 0) // EOF or error