3 # User Darren Salt <linux@youmustbejoking.demon.co.uk>
4 # Date 1221306490 -3600
5 # Node ID f5ff69fc65d3229ac9908b13c5bb0b9317adf80c
6 # Parent 89c3e23896babb1fc6fe0f4299fa645a47297d4c
7 Compilation fixes for ffmpeg API & ABI changes.
9 --- a/src/combined/ffmpeg/ff_audio_decoder.c Fri Sep 05 21:26:59 2008 +0200
10 +++ b/src/combined/ffmpeg/ff_audio_decoder.c Sat Sep 13 12:48:10 2008 +0100
11 @@ -322,7 +322,7 @@ static void ff_audio_decode_data (audio_
13 if (!this->output_open) {
14 if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
15 - avcodec_decode_audio (this->context,
16 + avcodec_decode_audio2 (this->context,
17 (int16_t *)this->decode_buffer,
20 --- a/src/combined/ffmpeg/ffmpeg_decoder.h Fri Sep 05 21:26:59 2008 +0200
21 +++ b/src/combined/ffmpeg/ffmpeg_decoder.h Sat Sep 13 12:48:10 2008 +0100
23 # include "../../libffmpeg/libavcodec/avcodec.h"
26 +#if LIBAVCODEC_VERSION_MAJOR > 51
27 +#define bits_per_sample bits_per_coded_sample
30 typedef struct ff_codec_s {