diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-15 12:28:58 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-07-15 12:28:58 +0100 |
| commit | 0eabb0332dd91fdcd5bccfbdd02862ae7d34f681 (patch) | |
| tree | 97e803f157e50346367b48b87c45507c583f709a /src/combined/ffmpeg/ff_audio_decoder.c | |
| parent | fb07620556cad09ebfd1454ea644300c5630276e (diff) | |
| download | xine-lib-0eabb0332dd91fdcd5bccfbdd02862ae7d34f681.tar.gz xine-lib-0eabb0332dd91fdcd5bccfbdd02862ae7d34f681.tar.bz2 | |
Recognise AMR audio (normally found in 3GP files).
Diffstat (limited to 'src/combined/ffmpeg/ff_audio_decoder.c')
| -rw-r--r-- | src/combined/ffmpeg/ff_audio_decoder.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c index 4d8e440bb..b3b54ab0a 100644 --- a/src/combined/ffmpeg/ff_audio_decoder.c +++ b/src/combined/ffmpeg/ff_audio_decoder.c @@ -108,6 +108,8 @@ static const ff_codec_t ff_audio_lookup[] = { {BUF_AUDIO_SMACKER, CODEC_ID_SMACKAUDIO, "Smacker (ffmpeg)"}, {BUF_AUDIO_FLVADPCM, CODEC_ID_ADPCM_SWF, "Flash ADPCM (ffmpeg)"}, {BUF_AUDIO_WAVPACK, CODEC_ID_WAVPACK, "WavPack (ffmpeg)"}, + {BUF_AUDIO_AMR_NB, CODEC_ID_AMR_NB, "AMR narrow band (ffmpeg)"}, + {BUF_AUDIO_AMR_WB, CODEC_ID_AMR_WB, "AMR wide band (ffmpeg)"}, }; @@ -598,7 +600,12 @@ static uint32_t supported_audio_types[] = { #ifdef CONFIG_WAVPACK_DECODER BUF_AUDIO_WAVPACK, #endif - + #ifdef CONFIG_AMR_NB_DECODER + BUF_AUDIO_AMR_NB, + #endif + #ifdef CONFIG_AMR_WB_DECODER + BUF_AUDIO_AMR_WB, + #endif 0 }; |