OSDN Git Service

Add CODEC_ID_PRORES and bump lavc minor version
authorTomas Härdin <tomas.hardin@codemill.se>
Thu, 3 Feb 2011 09:47:48 +0000 (10:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Feb 2011 02:10:11 +0000 (03:10 +0100)
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f5b82f45dce8b734074a5e72e22ae42078ae9ce9)

libavcodec/avcodec.h

index d0de610..dbfb777 100644 (file)
@@ -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,