diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-14 18:34:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-14 18:35:02 +0200 |
| commit | 3df787a1ef1600dda034d9e0c0b13bf27e952f22 (patch) | |
| tree | a06d3a96d243f870271ad2a331700b6f580b4708 /libavformat/asfenc.c | |
| parent | 46d5625f44185271862337d61cd246fd569c42a4 (diff) | |
| parent | d8b19ee672965641a12048f0b0b366d9146a166c (diff) | |
| download | ffmpeg-3df787a1ef1600dda034d9e0c0b13bf27e952f22.tar.gz | |
Merge branch 'flac' of https://github.com/FernetMenta/FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asfenc.c')
0 files changed, 0 insertions, 0 deletions