diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:01:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 13:02:19 +0200 |
| commit | 579e2b2874aeaa9cfdeed1fd1408767e33a63029 (patch) | |
| tree | 021938ef7311d1439e74b710d721a8668c41d712 /Makefile | |
| parent | 1c0ce2d4e0e70fcc42aa73fb5284f621025bb6c4 (diff) | |
| parent | 23f741f79327e31be7b2a75ebb2e02111e06e52f (diff) | |
| download | ffmpeg-579e2b2874aeaa9cfdeed1fd1408767e33a63029.tar.gz | |
Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'
* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f':
matroskadec: parse the channel layout mask for FLAC
Conflicts:
libavformat/oggparsevorbis.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions