[FFmpeg-cvslog] Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'
Michael Niedermayer
git at videolan.org
Wed May 28 13:08:21 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May 28 13:01:41 2014 +0200| [579e2b2874aeaa9cfdeed1fd1408767e33a63029] | committer: Michael Niedermayer
Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'
* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f':
matroskadec: parse the channel layout mask for FLAC
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=579e2b2874aeaa9cfdeed1fd1408767e33a63029
---
More information about the ffmpeg-cvslog
mailing list