diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:49:36 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:49:36 +0300 |
| commit | 7ef515cda5fdfa5800a9336a128bff1f1b85edea (patch) | |
| tree | 8605cdbc9924dfc7711e00910c731ca8a7d9837a /libavformat/version.h | |
| parent | 5162af67f41214edacefe05d9723e4a6d9847900 (diff) | |
| parent | 8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a (diff) | |
Merge commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a'
* commit '8a70ef94b9c377293b3dfa7d92cdc81a4fe1543a':
libavformat: Add a muxer wrapping mpegts encoding into RTP
Conflicts:
Changelog
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 d3ce0bf8c5..1d63932b4d 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 15 -#define LIBAVFORMAT_VERSION_MICRO 107 +#define LIBAVFORMAT_VERSION_MINOR 16 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |