diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 14:20:43 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 14:24:15 +0100 |
commit | 1c1bb203ddae855547e58fb1d08aee59888aa967 (patch) | |
tree | 563e9d67c04e926c0bbc39d2623104d04d0731fd /presets/libvpx-1080p50_60.ffpreset | |
parent | ec8e232b53b3c047f0e05eb4e385fd794fc3bf74 (diff) | |
parent | 682b2a809b446c4ca45f88a84c1d92ccfcbcfbd1 (diff) | |
download | ffmpeg-1c1bb203ddae855547e58fb1d08aee59888aa967.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: fix examples compilation when EXESUF is not empty
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libvpx-1080p50_60.ffpreset')
0 files changed, 0 insertions, 0 deletions