diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-11-23 10:13:05 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2011-11-23 10:13:05 +0200 |
| commit | fbab810f67b7febf0dd779cc974784cfefec1154 (patch) | |
| tree | ef01cf255951704cdb75789b6ffdfb60070c8adb /src | |
| parent | 7c4077fc7906cd4774efd0e38049f52ff6579fa9 (diff) | |
| parent | c6270c119022caab75c7a63bc99d46335a1b872a (diff) | |
| download | xine-lib-fbab810f67b7febf0dd779cc974784cfefec1154.tar.gz xine-lib-fbab810f67b7febf0dd779cc974784cfefec1154.tar.bz2 | |
Merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 4195b7b95..e4a9c16bf 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -173,7 +173,7 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ * - DVB streams where multiple AAC LATM frames are packed to single PES * - DVB streams where MPEG audio frames do not follow PES packet boundaries */ -#if LIBAVCODEC_VERSION_MAJOR >= 53 +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 94) if (codec_type == BUF_AUDIO_AAC_LATM || codec_type == BUF_AUDIO_MPEG) { @@ -356,7 +356,7 @@ static int ff_audio_decode(xine_t *xine, int consumed; int parser_consumed = 0; -#if LIBAVCODEC_VERSION_MAJOR >= 53 +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 94) if (parser_ctx) { uint8_t *outbuf; int outsize; @@ -383,7 +383,7 @@ static int ff_audio_decode(xine_t *xine, buf = outbuf; size = outsize; } -#endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */ +#endif /* LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 94) */ #if AVAUDIO > 2 AVPacket avpkt; |