diff options
| author | Matthew Hoops | 2011-05-31 13:58:05 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-31 13:58:05 -0400 |
| commit | bf8cfcb6b742566308085126e99ab1338370a14e (patch) | |
| tree | 101d430d4af1d38b6ec9e2c316a9edf06cffe883 /audio | |
| parent | bc7ff278281f46a77ba955d6f5fa20dab611bd90 (diff) | |
| download | scummvm-rg350-bf8cfcb6b742566308085126e99ab1338370a14e.tar.gz scummvm-rg350-bf8cfcb6b742566308085126e99ab1338370a14e.tar.bz2 scummvm-rg350-bf8cfcb6b742566308085126e99ab1338370a14e.zip | |
AUDIO: Plug MPEG-4/QuickTime audio into openStreamFile
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audiostream.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/audio/audiostream.cpp b/audio/audiostream.cpp index 776f904e77..0cfbabf53b 100644 --- a/audio/audiostream.cpp +++ b/audio/audiostream.cpp @@ -33,6 +33,7 @@ #include "audio/audiostream.h" #include "audio/decoders/flac.h" #include "audio/decoders/mp3.h" +#include "audio/decoders/quicktime.h" #include "audio/decoders/raw.h" #include "audio/decoders/vorbis.h" @@ -51,7 +52,7 @@ struct StreamFileFormat { }; static const StreamFileFormat STREAM_FILEFORMATS[] = { - /* decoderName, fileExt, openStreamFuntion */ + /* decoderName, fileExt, openStreamFunction */ #ifdef USE_FLAC { "FLAC", ".flac", makeFLACStream }, { "FLAC", ".fla", makeFLACStream }, @@ -62,6 +63,7 @@ static const StreamFileFormat STREAM_FILEFORMATS[] = { #ifdef USE_MAD { "MPEG Layer 3", ".mp3", makeMP3Stream }, #endif + { "MPEG-4 Audio", ".m4a", makeQuickTimeStream }, { NULL, NULL, NULL } // Terminator }; |