diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 20:40:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 20:40:26 +0200 |
| commit | 39e89f521159474a854927840e5a8cc4350ee587 (patch) | |
| tree | 61d2639aeed50d2ae685700c4f58865f8ce15a81 /libavcodec/version.h | |
| parent | 251f9dcf225b2aac2181da3d7e05413483e1be74 (diff) | |
| parent | 34efb8a169e4551326e069be47125c6c2cb7ab90 (diff) | |
| download | ffmpeg-39e89f521159474a854927840e5a8cc4350ee587.tar.gz | |
Merge commit '34efb8a169e4551326e069be47125c6c2cb7ab90'
* commit '34efb8a169e4551326e069be47125c6c2cb7ab90':
quickdraw: Support direct pixel blocks
Conflicts:
Changelog
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 a4aa547845..3f06f85cb9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 56 #define LIBAVCODEC_VERSION_MINOR 37 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |