diff options
| author | clone2727 | 2011-06-01 07:04:05 -0700 |
|---|---|---|
| committer | clone2727 | 2011-06-01 07:04:05 -0700 |
| commit | 49a8f7675f9685df984f5acd88ea4ac56b703f33 (patch) | |
| tree | 650593c4254ba11c212f3f409b8c96929d4bc4ee /audio/audiostream.cpp | |
| parent | 90f2cde9fa27b06fe7753d68d4166bc10c833942 (diff) | |
| parent | dfb682288699e84321c14cc5d52cbd3fdaeba40c (diff) | |
| download | scummvm-rg350-49a8f7675f9685df984f5acd88ea4ac56b703f33.tar.gz scummvm-rg350-49a8f7675f9685df984f5acd88ea4ac56b703f33.tar.bz2 scummvm-rg350-49a8f7675f9685df984f5acd88ea4ac56b703f33.zip | |
Merge pull request #20 from scott-t/t7g-ios
T7G iOS support
Diffstat (limited to 'audio/audiostream.cpp')
| -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 e6587a6543..547aa77526 100644 --- a/audio/audiostream.cpp +++ b/audio/audiostream.cpp @@ -30,6 +30,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" @@ -48,7 +49,7 @@ struct StreamFileFormat { }; static const StreamFileFormat STREAM_FILEFORMATS[] = { - /* decoderName, fileExt, openStreamFuntion */ + /* decoderName, fileExt, openStreamFunction */ #ifdef USE_FLAC { "FLAC", ".flac", makeFLACStream }, { "FLAC", ".fla", makeFLACStream }, @@ -59,6 +60,7 @@ static const StreamFileFormat STREAM_FILEFORMATS[] = { #ifdef USE_MAD { "MPEG Layer 3", ".mp3", makeMP3Stream }, #endif + { "MPEG-4 Audio", ".m4a", makeQuickTimeStream }, { NULL, NULL, NULL } // Terminator }; |