comparison mplayer.c @ 31977:4a4dcc72da52

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
comparison
equal deleted inserted replaced
31976:b2dc821f16a0 31977:4a4dcc72da52
2158 2158
2159 // Fill buffer if needed: 2159 // Fill buffer if needed:
2160 current_module="decode_audio"; 2160 current_module="decode_audio";
2161 t = GetTimer(); 2161 t = GetTimer();
2162 if (!format_change) { 2162 if (!format_change) {
2163 res = decode_audio(sh_audio, playsize); 2163 res = mp_decode_audio(sh_audio, playsize);
2164 format_change = res == -2; 2164 format_change = res == -2;
2165 } 2165 }
2166 if (!format_change && res < 0) // EOF or error 2166 if (!format_change && res < 0) // EOF or error
2167 if (mpctx->d_audio->eof) { 2167 if (mpctx->d_audio->eof) {
2168 audio_eof = 1; 2168 audio_eof = 1;