summaryrefslogtreecommitdiff
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2011-03-10 23:23:25 +1100
committerRonald S. Bultje <rsbultje@gmail.com>2011-03-14 08:05:01 -0400
commit0697440c1ef55e6def219cdf0e22682b0b71f089 (patch)
tree5969f36ad92dcb50c92a0f1dc41c65b3f83d348a /libavcodec/avcodec.h
parent21de920472cc3d338312957bfd03dcac278b5ae3 (diff)
Bitmap Brothers JV video decoder
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 12cca6ff97..6491e07452 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -32,8 +32,8 @@
#include "libavutil/cpu.h"
#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 113
-#define LIBAVCODEC_VERSION_MICRO 2
+#define LIBAVCODEC_VERSION_MINOR 114
+#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -261,6 +261,7 @@ enum CodecID {
CODEC_ID_MXPEG,
CODEC_ID_LAGARITH,
CODEC_ID_PRORES,
+ CODEC_ID_JV,
/* various PCM "codecs" */
CODEC_ID_PCM_S16LE= 0x10000,