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 /libavcodec/avcodec.h | |
| 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 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index eaeda8a3e8..c85dead5c6 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5,8 +5,8 @@ #define LIBAVCODEC_VERSION_INT 0x000406 #define LIBAVCODEC_VERSION "0.4.6" -#define LIBAVCODEC_BUILD 4633 -#define LIBAVCODEC_BUILD_STR "4633" +#define LIBAVCODEC_BUILD 4634 +#define LIBAVCODEC_BUILD_STR "4634" enum CodecID { CODEC_ID_NONE, @@ -32,6 +32,8 @@ enum CodecID { CODEC_ID_DVAUDIO, CODEC_ID_WMAV1, CODEC_ID_WMAV2, + CODEC_ID_MACE3, + CODEC_ID_MACE6, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE, @@ -805,6 +807,8 @@ extern AVCodec wmav2_decoder; extern AVCodec mjpeg_decoder; extern AVCodec mp2_decoder; extern AVCodec mp3_decoder; +extern AVCodec mace3_decoder; +extern AVCodec mace6_decoder; /* pcm codecs */ #define PCM_CODEC(id, name) \ |