diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-10-13 00:30:37 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-10-13 00:30:37 +0100 |
| commit | 9c92484c911e0f3d401a0230c90c4bcf40b84c05 (patch) | |
| tree | 4248cd1333a272bde1d21b598ea1108f186dd050 /src/combined/ffmpeg | |
| parent | 9063eb601ef82bb5a43faf2cc07ab87af9fd8977 (diff) | |
| parent | 574282f24812a9cfac7f120e08115b29362f44fa (diff) | |
| download | xine-lib-9c92484c911e0f3d401a0230c90c4bcf40b84c05.tar.gz xine-lib-9c92484c911e0f3d401a0230c90c4bcf40b84c05.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/xine-engine/buffer.h => include/xine/buffer.h
Diffstat (limited to 'src/combined/ffmpeg')
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 2 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 8559c6ece..476553e10 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -321,7 +321,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) if (!this->output_open) { if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { - avcodec_decode_audio (this->context, + avcodec_decode_audio2 (this->context, (int16_t *)this->decode_buffer, &decode_buffer_size, &this->buf[0], diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h index 6de9e8772..3eb86f4bf 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.h +++ b/src/combined/ffmpeg/ffmpeg_decoder.h @@ -31,6 +31,10 @@ # include <libavcodec/avcodec.h> #endif +#if LIBAVCODEC_VERSION_MAJOR > 51 +#define bits_per_sample bits_per_coded_sample +#endif + typedef struct ff_codec_s { uint32_t type; enum CodecID id; |