1.1 --- a/src/combined/ffmpeg/ff_audio_decoder.c	Fri Sep 05 21:26:59 2008 +0200
     1.2 +++ b/src/combined/ffmpeg/ff_audio_decoder.c	Sat Sep 13 12:48:10 2008 +0100
     1.3 @@ -322,7 +322,7 @@
     1.4  
     1.5      if (!this->output_open) {
     1.6        if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
     1.7 -        avcodec_decode_audio (this->context,
     1.8 +        avcodec_decode_audio2 (this->context,
     1.9                                (int16_t *)this->decode_buffer,
    1.10                                &decode_buffer_size,
    1.11                                &this->buf[0],

     2.1 --- a/src/combined/ffmpeg/ffmpeg_decoder.h	Fri Sep 05 21:26:59 2008 +0200
     2.2 +++ b/src/combined/ffmpeg/ffmpeg_decoder.h	Sat Sep 13 12:48:10 2008 +0100
     2.3 @@ -33,6 +33,10 @@
     2.4  #  include "../../libffmpeg/libavcodec/avcodec.h"
     2.5  #endif
     2.6  
     2.7 +#if LIBAVCODEC_VERSION_MAJOR > 51
     2.8 +#define bits_per_sample bits_per_coded_sample
     2.9 +#endif
    2.10 +
    2.11  typedef struct ff_codec_s {
    2.12    uint32_t          type;
    2.13    enum CodecID      id;