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)
commit5a1cd796e22473e1e64c4981720b0a09e2e9a13d
tree985a78a8053776d64db770245c8f487671bbd055
parent934f2d2f5c16df8aad9f401a9fd842b5d9a78b11
parent430a8168594b3cb29f44141d4da88f2c642de06f
Merge commit '430a8168594b3cb29f44141d4da88f2c642de06f'

* 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>
libavformat/oggparsevp8.c
libavformat/version.h