diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-04-19 05:22:52 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-04-19 05:22:52 +0000 |
| commit | 937d02699e60e422f2e420bcc9084dcaae25fd10 (patch) | |
| tree | 4c24b27d5bd778624689a722f0c5264566084d9a /src/libffmpeg/audio_decoder.c | |
| parent | 97c50cb77949856573d7f5f5a3c28cb73e61e011 (diff) | |
| download | xine-lib-937d02699e60e422f2e420bcc9084dcaae25fd10.tar.gz xine-lib-937d02699e60e422f2e420bcc9084dcaae25fd10.tar.bz2 | |
add support for a bunch of new FFmpeg codecs, corresponding to FFmpeg
build 4752
CVS patchset: 7464
CVS date: 2005/04/19 05:22:52
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 857bfad74..4aa353171 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.13 2005/03/06 07:15:05 tmmm Exp $ + * $Id: audio_decoder.c,v 1.14 2005/04/19 05:22:52 tmmm Exp $ * * xine audio decoder plugin using ffmpeg * @@ -99,7 +99,8 @@ static const ff_codec_t ff_audio_lookup[] = { {BUF_AUDIO_MAC6, CODEC_ID_MACE6, "MACE 6:1 (ffmpeg)"}, {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_FLAC, CODEC_ID_FLAC, "FLAC (ffmpeg)"}, + {BUF_AUDIO_ALAC, CODEC_ID_ALAC, "ALAC (ffmpeg)"} }; static void ff_audio_ensure_buffer_size(ff_audio_decoder_t *this, int size) { @@ -434,6 +435,7 @@ static uint32_t supported_audio_types[] = { BUF_AUDIO_EA_ADPCM, BUF_AUDIO_SMJPEG_IMA, BUF_AUDIO_FLAC, + BUF_AUDIO_ALAC, /* BUF_AUDIO_MPEG, */ 0 }; |