Michael Niedermayer
|
5a1cd796e2
|
Merge commit '430a8168594b3cb29f44141d4da88f2c642de06f'
* commit '430a8168594b3cb29f44141d4da88f2c642de06f':
oggdec: add support for VP8 demuxing
Conflicts:
Changelog
libavformat/oggparsevp8.c
libavformat/version.h
See: d890db5f53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-12-19 04:36:45 +01:00 |
James Almer
|
430a816859
|
oggdec: add support for VP8 demuxing
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
|
2014-12-18 23:27:07 +01:00 |
|
James Almer
|
dffbac0956
|
lavf/oggparsevp8: use ff_vorbis_stream_comment()
commit db68ef89 did not update the vp8 parser
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-08-14 05:47:06 +02:00 |
|
Michael Niedermayer
|
579e2b2874
|
Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'
* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f':
matroskadec: parse the channel layout mask for FLAC
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
2014-05-28 13:02:19 +02:00 |
|
James Almer
|
d890db5f53
|
oggdec: add support for VP8 demuxing
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-12-30 04:05:27 +01:00 |