summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorRoberto Togni <r_togni@tiscali.it>2005-02-15 20:58:32 +0000
committerRoberto Togni <r_togni@tiscali.it>2005-02-15 20:58:32 +0000
commitd2a7718df93e27c914717b5bceab5a218abd7a84 (patch)
tree1fe89f3f301c69737dca75286d2ea0d64d63c790 /libavcodec/avcodec.h
parent171d7d788a38586fa3901673f7c8e7534c9fc8f4 (diff)
Multichannel mp3 in mp4 support ISO/IEC 14496-3:2001/FPDAM 3 (MP3onMP4)
Derived from MPlayer patch by Larry Ruedisueli Originally committed as revision 3955 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 9a32df7707..6aeb926f1f 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -17,7 +17,7 @@ extern "C" {
#define FFMPEG_VERSION_INT 0x000409
#define FFMPEG_VERSION "0.4.9-pre1"
-#define LIBAVCODEC_BUILD 4742
+#define LIBAVCODEC_BUILD 4743
#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
#define LIBAVCODEC_VERSION FFMPEG_VERSION
@@ -162,6 +162,7 @@ enum CodecID {
CODEC_ID_SONIC_LS,
CODEC_ID_FLAC,
CODEC_ID_MP3ADU,
+ CODEC_ID_MP3ON4,
CODEC_ID_MPEG2TS= 0x20000, /* _FAKE_ codec to indicate a raw MPEG2 transport
stream (only used by libavformat) */
@@ -1946,6 +1947,7 @@ extern AVCodec png_decoder;
extern AVCodec mp2_decoder;
extern AVCodec mp3_decoder;
extern AVCodec mp3adu_decoder;
+extern AVCodec mp3on4_decoder;
extern AVCodec mace3_decoder;
extern AVCodec mace6_decoder;
extern AVCodec huffyuv_decoder;