diff options
| author | Peter Ross <pross@xvid.org> | 2011-03-10 23:23:25 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-11 12:25:47 +0100 |
| commit | 2f46a0af8d0058c308d2365d1da76c6a0ff185a4 (patch) | |
| tree | 27cf0250129c25cf98160c63316b382bd974a722 /libavcodec/avcodec.h | |
| parent | 75a8e0f0ab644701061aec87f11a79fcaa8c1c29 (diff) | |
| download | ffmpeg-2f46a0af8d0058c308d2365d1da76c6a0ff185a4.tar.gz | |
Bitmap Brothers JV video decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 07c9aad8d6..a60de9cae6 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, |