diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-29 15:51:59 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-12-29 15:51:59 +0200 |
| commit | 57ce95b96a9d5ff75b5afa608bdda8366a999cf5 (patch) | |
| tree | 416883d01181a719c50d460b49a2a7aa575bcfde /mencoder.c | |
| parent | d7d8babe61914f14df1fc1bab173574e1fabad1e (diff) | |
| download | mpv-57ce95b96a9d5ff75b5afa608bdda8366a999cf5.tar.bz2 mpv-57ce95b96a9d5ff75b5afa608bdda8366a999cf5.tar.xz | |
audio: Remove fixed decode_audio() return size limit (MAX_OUTBURST)
A couple of months ago MPlayer's ALSA driver started rounding the
amount of input data it was willing to accept in one call down to an
integer multiple of the value it set in ao_data.outburst. In some
configurations it was possible for this value to exceed the 64 KiB
limit on the amount MPlayer was willing to write in a single call to
the AO. As a result ao_alsa accepted 0 bytes in each play() call and
audio playback failed. Fix this by removing the fixed 64 KiB limit on
the amount of audio sent to AO at once; the limit was mostly a remnant
of older code anyway.
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c index 1f00adc7f0..908f9a80e4 100644 --- a/mencoder.c +++ b/mencoder.c @@ -330,7 +330,6 @@ static int dec_audio(sh_audio_t *sh_audio,unsigned char* buffer,int total){ int at_eof=0; 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(len>sh_audio->a_out_buffer_len) len=sh_audio->a_out_buffer_len; fast_memcpy(buffer+size,sh_audio->a_out_buffer,len); |