aboutsummaryrefslogtreecommitdiffstats
path: root/cmdutils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-10 13:51:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-10 13:51:07 +0200
commitb7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (patch)
treee4566b574da96ea49e59e3d5bc03ecbbde903f15 /cmdutils.c
parenteb71f027f0581fd732fe33e559e38855f90da66f (diff)
parentfb722a900fc5cc9e003b9fef25b27ed7fc5547a2 (diff)
downloadffmpeg-b7ebb49d035205bcfbcc4f1788df5ba1419fadc8.tar.gz
Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'
* commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2': avconv: remove -same_quant Conflicts: Changelog doc/faq.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
0 files changed, 0 insertions, 0 deletions