summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Bindhammer <tobias.bindhammer@uni-ulm.de>2010-08-23 11:51:04 +0000
committerTobias Bindhammer <tobias.bindhammer@uni-ulm.de>2010-08-23 11:51:04 +0000
commit40c5ee990376abc56149b218b3d0873a638b4a6a (patch)
tree177aa9beab957ecd55bea497ea688f7941e9b8eb
parent8fb9e19802e0b70620175da0487dd9afa7077e2d (diff)
added codec-ids for the a64 codec
Originally committed as revision 24877 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/avcodec.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 7fba26874b..f8a4df4df9 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -30,7 +30,7 @@
#include "libavutil/avutil.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 85
+#define LIBAVCODEC_VERSION_MINOR 86
#define LIBAVCODEC_VERSION_MICRO 1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -213,6 +213,9 @@ enum CodecID {
CODEC_ID_VP8,
CODEC_ID_PICTOR,
CODEC_ID_ANSI,
+ CODEC_ID_A64_MULTI,
+ CODEC_ID_A64_MULTI5,
+
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,