diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:36:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:36:45 +0100 |
| commit | 5a1cd796e22473e1e64c4981720b0a09e2e9a13d (patch) | |
| tree | 985a78a8053776d64db770245c8f487671bbd055 /libavcodec/pel_template.c | |
| parent | 934f2d2f5c16df8aad9f401a9fd842b5d9a78b11 (diff) | |
| parent | 430a8168594b3cb29f44141d4da88f2c642de06f (diff) | |
| download | ffmpeg-5a1cd796e22473e1e64c4981720b0a09e2e9a13d.tar.gz | |
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>
Diffstat (limited to 'libavcodec/pel_template.c')
0 files changed, 0 insertions, 0 deletions