diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-11 11:24:45 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-11 11:24:45 +0400 |
| commit | 9696ad6a76534b16dfaf9872dd20017f9f8d18e4 (patch) | |
| tree | 2d766f16cc4c8db5cfc895f1ef807ed1866084b0 /libavcodec/version.h | |
| parent | fd3cdcaf5f4d4f21e61491f19742092f855e93ac (diff) | |
| parent | 395c3feb3bb165af5760d287a9a64344b6269fe2 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: fix 'clean' target
ZeroCodec: Flip output
Conflicts:
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 1aab993df8..bea75d96b3 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 54 #define LIBAVCODEC_VERSION_MINOR 79 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |