videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-10 11:06:29 +02:00
Code Releases Activity
64,744 Commits 37 Branches 400 Tags 219 MiB
162cffca80
Commit Graph

2 Commits

Author SHA1 Message Date
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