Merge commit '430a8168594b3cb29f44141d4da88f2c642de06f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:36:27 +0000 (04:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:36:45 +0000 (04:36 +0100)
* commit '430a8168594b3cb29f44141d4da88f2c642de06f':
  oggdec: add support for VP8 demuxing

Conflicts:
Changelog
libavformat/oggparsevp8.c
libavformat/version.h

See: d890db5f537bdfc9d73e7fdac1ff4216e5a43fc2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/oggparsevp8.c
libavformat/version.h

Simple merge
index 1d63932b4d5c855def4f9a743444261fe41c81bd,193cc9612e4898d1363724ce9a5ed1f3a44b8c97..95d84fe4c6ee8de6b334b0bc6502051b5d696765
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/version.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 56
 -#define LIBAVFORMAT_VERSION_MINOR 10
 -#define LIBAVFORMAT_VERSION_MICRO  0
 +#define LIBAVFORMAT_VERSION_MINOR  16
- #define LIBAVFORMAT_VERSION_MICRO 100
++#define LIBAVFORMAT_VERSION_MICRO 101
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \