diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 01:14:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 01:14:31 +0100 |
| commit | dfea1acb21f3a3945d04537855ab6412c2b4e323 (patch) | |
| tree | 5eb54b082827af6f57b2ea5fd62570981f9e311a /libavutil/version.h | |
| parent | 001b28b0211b6501f9ffa1e6187b8a111901464f (diff) | |
| parent | e4fe535d12f4f30df2dd672e30304af112a5a827 (diff) | |
Merge commit 'e4fe535d12f4f30df2dd672e30304af112a5a827'
* commit 'e4fe535d12f4f30df2dd672e30304af112a5a827':
mov: Write the display matrix in order
Conflicts:
libavformat/mov.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/version.h')
| -rw-r--r-- | libavutil/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/version.h b/libavutil/version.h index 5d433082b8..897384aecf 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -57,7 +57,7 @@ #define LIBAVUTIL_VERSION_MAJOR 54 #define LIBAVUTIL_VERSION_MINOR 20 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |