diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 05:13:16 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 05:13:16 +0300 |
| commit | f38e2bcb72ee2df60ce0fbeb2e33ce0ca8ebd7e8 (patch) | |
| tree | f5705f1f602bbd4ce4d8f0fc1d25e2da23c1bcda /libavformat/version.h | |
| parent | 504267fb56ba815ff896f9d5a7ce129a8ae674ab (diff) | |
| parent | 847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b (diff) | |
Merge commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b'
* commit '847bf5988fec1d3e65c1d8cf0cdb8caf0cfd0c1b':
movenc: Add an option for delaying writing the moov with empty_moov
Conflicts:
libavformat/movenc.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index a4b9a43f20..9c121646a0 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 56 -#define LIBAVFORMAT_VERSION_MINOR 16 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MINOR 17 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |