diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 00:41:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 01:04:04 +0100 |
| commit | c9a9a7a1fd7e00a838a94e3792235ceb4755648c (patch) | |
| tree | 46ce16501fce2cc79d419266255fa501db9d53cf /libavformat/version.h | |
| parent | e2e36a739d3ad0d207a31c76f414a912d08b1d6d (diff) | |
| parent | 9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d (diff) | |
Merge commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d'
* commit '9cbf70fa0e44613590b019cef1fe99aa3f3c5d9d':
movenc: Write correct presentation timestamps in tfra
Conflicts:
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 1368f2327f..4596175b43 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MINOR 12 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MICRO 103 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |