From 052247521959a2454b32d720d52aba43f30578f2 Mon Sep 17 00:00:00 2001 From: Mike Melanson Date: Wed, 2 Aug 2006 07:15:27 +0000 Subject: hook up new FFmpeg decoders, including VC-1/WMV9 CVS patchset: 8150 CVS date: 2006/08/02 07:15:27 --- src/libffmpeg/audio_decoder.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/libffmpeg/audio_decoder.c') diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c index a1a760100..11f14aeac 100644 --- a/src/libffmpeg/audio_decoder.c +++ b/src/libffmpeg/audio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.c,v 1.25 2006/06/18 20:29:04 dgp85 Exp $ + * $Id: audio_decoder.c,v 1.26 2006/08/02 07:15:27 tmmm Exp $ * * xine audio decoder plugin using ffmpeg * @@ -102,7 +102,11 @@ static const ff_codec_t ff_audio_lookup[] = { {BUF_AUDIO_FLAC, CODEC_ID_FLAC, "FLAC (ffmpeg)"}, {BUF_AUDIO_SHORTEN, CODEC_ID_SHORTEN, "Shorten (ffmpeg)"}, {BUF_AUDIO_ALAC, CODEC_ID_ALAC, "ALAC (ffmpeg)"}, - {BUF_AUDIO_QDESIGN2, CODEC_ID_QDM2, "QDM2 (ffmpeg)"} }; + {BUF_AUDIO_COOK, CODEC_ID_COOK, "RealAudio Cooker (ffmpeg)"}, + {BUF_AUDIO_TRUESPEECH, CODEC_ID_TRUESPEECH, "TrueSpeech (ffmpeg)"}, + {BUF_AUDIO_TTA, CODEC_ID_TTA, "True Audio Lossless (ffmpeg)"}, + {BUF_AUDIO_SMACKER, CODEC_ID_SMACKAUDIO, "Smacker (ffmpeg)"}, +}; static void ff_audio_ensure_buffer_size(ff_audio_decoder_t *this, int size) { @@ -463,6 +467,10 @@ static uint32_t supported_audio_types[] = { BUF_AUDIO_SHORTEN, BUF_AUDIO_MPEG, BUF_AUDIO_QDESIGN2, + BUF_AUDIO_COOK, + BUF_AUDIO_TRUESPEECH, + BUF_AUDIO_TTA, + BUF_AUDIO_SMACKER, 0 }; -- cgit v1.2.3