diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-27 18:26:12 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-27 18:26:16 +0100 |
commit | 1fd04cac001fea37a4b883bd2023ebc617f81288 (patch) | |
tree | 40b8ea1d615e569c2bb8fe10686acc0437e96419 /ffmpeg.c | |
parent | 9774145fe5ae9d463511eb63ad49017a271f2e20 (diff) | |
parent | c53e8d9029f5aeab8cf1f81d21c89502d8fafb62 (diff) | |
download | ffmpeg-1fd04cac001fea37a4b883bd2023ebc617f81288.tar.gz |
Merge remote-tracking branch 'fredjean/master'
* fredjean/master:
Include fix for building ismindex under MinGW
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions