diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 12:20:44 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-28 12:21:50 +0200 |
commit | 03ffaed3f0199f82ae32c28923f41f22123aea95 (patch) | |
tree | bd8b84c228cf36acce71d0206d570cd4aab6c280 /libavformat/cafenc.c | |
parent | ef13967e601bb0851af04182ea2aeeea8a3025bd (diff) | |
parent | d6b9ce99ea384fb676561461768b8316725a4ccd (diff) | |
download | ffmpeg-streaming-03ffaed3f0199f82ae32c28923f41f22123aea95.zip ffmpeg-streaming-03ffaed3f0199f82ae32c28923f41f22123aea95.tar.gz |
Merge commit 'd6b9ce99ea384fb676561461768b8316725a4ccd'
* commit 'd6b9ce99ea384fb676561461768b8316725a4ccd':
flac demuxer: parse the WAVEFORMATEXTENSIBLE_CHANNEL_MASK tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cafenc.c')
0 files changed, 0 insertions, 0 deletions