diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 14:27:07 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-18 14:31:01 +0200 |
commit | ed0aed09e8a19d255963c21c7aeda18cee3d9422 (patch) | |
tree | 59457517f96fdcd372f73da491372314a3d158d6 /libavcodec/version.h | |
parent | 849bb62c2c9afdb1e81f44870645a6990c4ce1fc (diff) | |
parent | 350914fc8024612f614c0a4f5c8ba5da2d9988e7 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Escape 130 (RPL) decoder
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/codec_desc.c
libavcodec/escape130.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 360ebac924..be9a580cfb 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 10 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |