diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-08 17:31:27 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-08 17:31:31 +0100 |
commit | 162f34497114e49528e45b42e4255db9fa8260cf (patch) | |
tree | 8914ef0b916dd1ebd5b5f5b26d6665841d389949 /.gitignore | |
parent | 55feff57cec85cfcc972d40e02af131f0cb86a34 (diff) | |
parent | a2bc8c56016d3854daae7e684c4bb00eaf5839cb (diff) | |
download | ffmpeg-162f34497114e49528e45b42e4255db9fa8260cf.tar.gz |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix standalone compilation of the mov muxer with --disable-optimizations.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions