Mercurial > mplayer.hg

diff mencoder.c @ 31977:4a4dcc72da52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename decode_audio() to mp_decode_audio(). The name clashes with the decode_audio function pointer in the ad_functions struct.
author diego
date Tue, 07 Sep 2010 23:29:49 +0000
parents 96559880e475
children b429f2102412
line wrap: on
line diff
--- a/mencoder.c	Tue Sep 07 22:04:35 2010 +0000
+++ b/mencoder.c	Tue Sep 07 23:29:49 2010 +0000
@@ -301,7 +301,8 @@
     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;