diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2005-05-29 19:20:48 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2005-05-29 19:20:48 +0000 |
| commit | e721b1d6d1472d1cce88bcc7f94b9b8909bdc943 (patch) | |
| tree | 0dccd417b1525f342e79b2d9fd3f149e4b778256 /src/libffmpeg/audio_decoder.c | |
| parent | 6a810cd8478bc874ce38ee809ceb730057648597 (diff) | |
| download | xine-lib-e721b1d6d1472d1cce88bcc7f94b9b8909bdc943.tar.gz xine-lib-e721b1d6d1472d1cce88bcc7f94b9b8909bdc943.tar.bz2 | |
Hook up the ffmpeg shorten decoder
CVS patchset: 7592
CVS date: 2005/05/29 19:20:48
Diffstat (limited to 'src/libffmpeg/audio_decoder.c')
| -rw-r--r-- | src/libffmpeg/audio_decoder.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c index 4aa353171..9450c06e4 100644 --- a/src/libffmpeg/audio_decoder.c +++ b/src/libffmpeg/audio_decoder.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2001-2004 the xine project + * Copyright (C) 2001-2005 the xine project * * This file is part of xine, a free video player. * @@ -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.14 2005/04/19 05:22:52 tmmm Exp $ + * $Id: audio_decoder.c,v 1.15 2005/05/29 19:20:49 jstembridge Exp $ * * xine audio decoder plugin using ffmpeg * @@ -100,6 +100,7 @@ static const ff_codec_t ff_audio_lookup[] = { {BUF_AUDIO_XAN_DPCM, CODEC_ID_XAN_DPCM, "Origin Xan DPCM (ffmpeg)"}, {BUF_AUDIO_VMD, CODEC_ID_VMDAUDIO, "Sierra VMD Audio (ffmpeg)"}, {BUF_AUDIO_FLAC, CODEC_ID_FLAC, "FLAC (ffmpeg)"}, + {BUF_AUDIO_SHORTEN, CODEC_ID_SHORTEN, "Shorten (ffmpeg)"}, {BUF_AUDIO_ALAC, CODEC_ID_ALAC, "ALAC (ffmpeg)"} }; @@ -436,6 +437,7 @@ static uint32_t supported_audio_types[] = { BUF_AUDIO_SMJPEG_IMA, BUF_AUDIO_FLAC, BUF_AUDIO_ALAC, + BUF_AUDIO_SHORTEN, /* BUF_AUDIO_MPEG, */ 0 }; |