diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/libffmpeg/audio_decoder.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -15,7 +15,7 @@ xine-lib (1.1.1) * implement time seeking on DVD plugin (*** remind: dvdnav might need a sync ***) * move CFLAGS optimizations to a separated file (added --disable-optimizations) * use the same codec path as MPlayer (/usr[/local]/lib/codecs) - * FFmpeg sync (new QDM2 decoder *** note: not yet working?) + * FFmpeg sync (new QDM2 decoder) * imported Duck TrueMotion 2 decoder from FFmpeg * sync libfaad2 to newer version; fixes AAC decoding on x86_64 arch diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c index 5a82df797..42a773138 100644 --- a/src/libffmpeg/audio_decoder.c +++ b/src/libffmpeg/audio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.c,v 1.20 2005/10/23 12:56:26 miguelfreitas Exp $ + * $Id: audio_decoder.c,v 1.21 2005/10/30 00:32:52 miguelfreitas Exp $ * * xine audio decoder plugin using ffmpeg * @@ -282,7 +282,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) "ffmpeg_audio_dec: error decompressing audio frame\n"); this->size=0; return; - } else if (bytes_consumed == 0) { + } else if (bytes_consumed == 0 && decode_buffer_size == 0) { if (offset) memmove(this->buf, &this->buf[offset], this->size); return; |