[FFmpeg-cvslog] Add CODEC_ID_PRORES and bump lavc minor version

Tomas Härdin git
Fri Feb 4 03:37:02 CET 2011


ffmpeg | branch: master | Tomas H?rdin <tomas.hardin at codemill.se> | Thu Feb  3 10:47:48 2011 +0100| [6cd67b9f5b030d18102d242e6be58d02cd932394] | committer: Michael Niedermayer

Add CODEC_ID_PRORES and bump lavc minor version

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit f5b82f45dce8b734074a5e72e22ae42078ae9ce9)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6cd67b9f5b030d18102d242e6be58d02cd932394
---

 libavcodec/avcodec.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d0de610..dbfb777 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,




More information about the ffmpeg-cvslog mailing list