diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 11:51:33 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-27 11:51:33 +0100 |
commit | ace0cfea60a32c2d2c89ce31fed8466625b09ac6 (patch) | |
tree | 442bd781b252ab542a7ebbc8b6a0435ae8cab05d /libavcodec/version.h | |
parent | 12f203a0987935b79870a9502b7e148fa064897c (diff) | |
parent | 05fa79b8448059913dea321fdf92764b64deeecc (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: fix use with frame based multithreading
Conflicts:
libavcodec/h263dec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
-rw-r--r-- | libavcodec/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index 5cf07bc31a..ec98b91689 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 1 +#define LIBAVCODEC_VERSION_MINOR 2 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |