summaryrefslogtreecommitdiff
path: root/libavformat/oggparsevp8.c
Commit message (Collapse)AuthorAge
* Merge commit '430a8168594b3cb29f44141d4da88f2c642de06f'Michael Niedermayer2014-12-19
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * oggdec: add support for VP8 demuxingJames Almer2014-12-18
| | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* lavf/oggparsevp8: use ff_vorbis_stream_comment()James Almer2014-08-14
| | | | | | | commit db68ef89 did not update the vp8 parser Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'Michael Niedermayer2014-05-28
| | | | | | | | | | * commit '23f741f79327e31be7b2a75ebb2e02111e06e52f': matroskadec: parse the channel layout mask for FLAC Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* oggdec: add support for VP8 demuxingJames Almer2013-12-30
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>