summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorTomas Härdin <tomas.hardin@codemill.se>2011-02-03 10:47:48 +0100
committerMans Rullgard <mans@mansr.com>2011-02-03 11:38:09 +0000
commitf5b82f45dce8b734074a5e72e22ae42078ae9ce9 (patch)
treeb28e7ce0a83de83e672361fead0c6fdce9064732 /libavcodec
parentaa42cce57ddf34b4e2c365859206eb52e2415ff5 (diff)
Add CODEC_ID_PRORES and bump lavc minor version
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d0de6107d1..dbfb77795d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -32,7 +32,7 @@
#include "libavutil/cpu.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 108
+#define LIBAVCODEC_VERSION_MINOR 109
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -260,6 +260,7 @@ enum CodecID {
CODEC_ID_R10K,
CODEC_ID_MXPEG,
CODEC_ID_LAGARITH,
+ CODEC_ID_PRORES,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,