# HG changeset patch # User rfelker # Date 1075185016 0 # Node ID 6107e58dcc2825062228d7db05cd445a8cebc41e # Parent 25deff3ac94285c60905f3ecf782585e9ab2100f not pretty, but at least it prevents the channels from getting out of order... the real solution is to get rid of libaf (probably the worst code in mplayer!) and replace it with a good audio layer... diff -r 25deff3ac942 -r 6107e58dcc28 libmpcodecs/dec_audio.c --- a/libmpcodecs/dec_audio.c Tue Jan 27 06:02:29 2004 +0000 +++ b/libmpcodecs/dec_audio.c Tue Jan 27 06:30:16 2004 +0000 @@ -438,8 +438,10 @@ declen, pafd->len, maxlen); // copy filter==>out: - if(maxlen < pafd->len) + if(maxlen < pafd->len) { + maxlen -= maxlen % (sh_audio->channels * sh_audio->samplesize); mp_msg(MSGT_DECAUDIO,MSGL_WARN,"%i bytes of audio data lost due to buffer overflow, len = %i\n", pafd->len - maxlen,pafd->len); + } else maxlen=pafd->len; memmove(buf, pafd->audio, maxlen);