diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 10:10:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-05 10:12:53 +0100 |
| commit | 63ea3a86b7ce7c4f6dca40387fb948a9bb9b2b9b (patch) | |
| tree | 6e6eaee1e1ffe5d1fbb82af926dd3e937b491ed1 /libavformat/version.h | |
| parent | dcf7924f4df642eba3101e1e13a40768bf24ebf7 (diff) | |
| parent | 9c09fbd8053292267cdc4b542913ceced43ea3a9 (diff) | |
Merge commit '9c09fbd8053292267cdc4b542913ceced43ea3a9'
* commit '9c09fbd8053292267cdc4b542913ceced43ea3a9':
rtpdec: experimental VP9 depacketizer (draft 0)
Conflicts:
libavformat/rtpdec.c
libavformat/rtpdec_vp9.c
libavformat/version.h
See: e4a6486c17dd90b338450ac7e151ffbf5370948a
See: f966ac2b6e3f08c41f3c45ab5efff768db62ac5a
See: 629a03a9128bd2e51286258e12183b1d06f509a7
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 90ed8447c7..ba4c7c8e98 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MINOR 25 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |