ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Dec 19
04:36:27 2014 +0100| [5a1cd796e22473e1e64c4981720b0a09e2e9a13d] | committer:
Michael Niedermayer
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 <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a1cd796e22473e1e64c4981720b0a09e2e9a13d
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
