diff options
| author | Michael Niedermayer <[email protected]> | 2012-10-10 13:51:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2012-10-10 13:51:07 +0200 |
| commit | b7ebb49d035205bcfbcc4f1788df5ba1419fadc8 (patch) | |
| tree | e4566b574da96ea49e59e3d5bc03ecbbde903f15 /tools | |
| parent | eb71f027f0581fd732fe33e559e38855f90da66f (diff) | |
| parent | fb722a900fc5cc9e003b9fef25b27ed7fc5547a2 (diff) | |
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 <[email protected]>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions