diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-03 21:16:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-03 21:16:31 +0100 |
| commit | 0dd53e14f9684a787d6c66d3cb44afb0a6bb2b7b (patch) | |
| tree | 8cabd5eee3f865caaa4d1f259ea19fe8e2a16139 /libavformat/version.h | |
| parent | b7d3fbc69bb60ab2c1369ac5ba20f23565a4db8d (diff) | |
| parent | 0af3b65880573aa9b3375362eaab4f84140c7dde (diff) | |
| download | ffmpeg-0dd53e14f9684a787d6c66d3cb44afb0a6bb2b7b.tar.gz | |
Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'
* commit '0af3b65880573aa9b3375362eaab4f84140c7dde':
asf: do not export XMP metadata by default
Conflicts:
libavformat/asfdec.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index 08ab50be6f..6a5c3d53e0 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MINOR 24 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |