Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f' | Michael Niedermayer | 2014-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 demuxing | James Almer | 2013-12-30 |
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> |