diff options
| author | François Revol <revol@free.fr> | 2002-11-02 10:39:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-02 10:39:22 +0000 |
| commit | 3f95e8434b170ae91e3dc5397d9e88da6d5acba7 (patch) | |
| tree | a7db4a7bbf07d078a5a6116f723f4c0eaff93eed /libav | |
| parent | 9ddd71fc6063b357344f81a0f704c1d04f584ada (diff) | |
| download | ffmpeg-3f95e8434b170ae91e3dc5397d9e88da6d5acba7.tar.gz | |
added MACE (Macintosh Audio Compression/Expansion) 3:1 & 6:1 support
contribution by Laszlo Torok <torokl@alpha.dfmk.hu>
4CC 'MAC3' and 'MAC6' in Quicktime.
It works for mono streams, needs to be fixed for stereo when I get my hands on a stereo sample :)
patch by (François Revol <revol at free dot fr>)
Originally committed as revision 1145 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libav')
| -rw-r--r-- | libav/mov.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libav/mov.c b/libav/mov.c index b1230f4c4c..c8c2c3e05e 100644 --- a/libav/mov.c +++ b/libav/mov.c @@ -121,6 +121,8 @@ static const CodecTag mov_audio_tags[] = { { CODEC_ID_PCM_MULAW, MKTAG('u', 'l', 'a', 'w') }, /* */ { CODEC_ID_PCM_ALAW, MKTAG('a', 'l', 'a', 'w') }, /* */ { CODEC_ID_ADPCM_IMA_QT, MKTAG('i', 'm', 'a', '4') }, /* IMA-4 ADPCM */ + { CODEC_ID_MACE3, MKTAG('M', 'A', 'C', '3') }, /* Macintosh Audio Compression and Expansion 3:1 */ + { CODEC_ID_MACE6, MKTAG('M', 'A', 'C', '6') }, /* Macintosh Audio Compression and Expansion 6:1 */ { CODEC_ID_MP2, MKTAG('.', 'm', 'p', '3') }, /* MPEG layer 3 */ /* sample files at http://www.3ivx.com/showcase.html use this tag */ { CODEC_ID_MP2, 0x6D730055 }, /* MPEG layer 3 */ @@ -829,9 +831,11 @@ static int parse_stco(const MOVParseTableEntry *parse_table, ByteIOContext *pb, } else return -1; #ifdef DEBUG +/* for(i=0; i<entries; i++) { printf("chunk offset=0x%Lx\n", sc->chunk_offsets[i]); } +*/ #endif return 0; } |