Mercurial > mplayer.hg
changeset 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 | b2dc821f16a0 |
| children | 3525dc14e3dc |
| files | libmpcodecs/dec_audio.c libmpcodecs/dec_audio.h mencoder.c mplayer.c |
| diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpcodecs/dec_audio.c Tue Sep 07 22:04:35 2010 +0000 +++ b/libmpcodecs/dec_audio.c Tue Sep 07 23:29:49 2010 +0000 @@ -428,7 +428,7 @@ * 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;
--- a/libmpcodecs/dec_audio.h Tue Sep 07 22:04:35 2010 +0000 +++ b/libmpcodecs/dec_audio.h Tue Sep 07 23:29:49 2010 +0000 @@ -30,7 +30,7 @@ // 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);
--- 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;
--- 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