aboutsummaryrefslogtreecommitdiffstats
path: root/ffpresets/libvpx-1080p50_60.ffpreset
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-07-14 21:27:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-07-14 21:27:13 +0200
commit8bc3a4807e2da36f458e7784c3d390dbd19899a5 (patch)
tree0e6cf4e0f125f3e6c702479a68804e6f2e2bb203 /ffpresets/libvpx-1080p50_60.ffpreset
parent321b2a9ded0468670b7678b7c098886930ae16b2 (diff)
downloadffmpeg-8bc3a4807e2da36f458e7784c3d390dbd19899a5.tar.gz
cmdutils: remove #if 0-ed conflict marger trash that i forgot
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffpresets/libvpx-1080p50_60.ffpreset')
0 files changed, 0 insertions, 0 deletions