From 6cd67b9f5b030d18102d242e6be58d02cd932394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= Date: Thu, 3 Feb 2011 10:47:48 +0100 Subject: [PATCH] Add CODEC_ID_PRORES and bump lavc minor version Signed-off-by: Mans Rullgard (cherry picked from commit f5b82f45dce8b734074a5e72e22ae42078ae9ce9) --- libavcodec/avcodec.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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,