Mercurial > mplayer.hg

diff mplayer.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 c2d29ae022a4
children 184969a3a437
line wrap: on
line diff
--- a/mplayer.c	Tue Sep 07 22:04:35 2010 +0000
+++ b/mplayer.c	Tue Sep 07 23:29:49 2010 +0000
@@ -2160,7 +2160,7 @@
 	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