diff options
| author | Tomas Härdin <tomas.hardin@codemill.se> | 2011-02-03 10:47:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-04 03:10:11 +0100 |
| commit | 6cd67b9f5b030d18102d242e6be58d02cd932394 (patch) | |
| tree | e6d72307c8b71b969ca2795ae7f4edc649045989 /libavcodec | |
| parent | d25d1d06a4805f0d119e75387c35017b420a691e (diff) | |
Add CODEC_ID_PRORES and bump lavc minor version
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f5b82f45dce8b734074a5e72e22ae42078ae9ce9)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 3 |
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, |