Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Oct 2012 11:51:07 +0000 (13:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 10 Oct 2012 11:51:07 +0000 (13:51 +0200)
commitb7ebb49d035205bcfbcc4f1788df5ba1419fadc8
treee4566b574da96ea49e59e3d5bc03ecbbde903f15
parenteb71f027f0581fd732fe33e559e38855f90da66f
parentfb722a900fc5cc9e003b9fef25b27ed7fc5547a2
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>
Changelog
doc/faq.texi
doc/ffmpeg.texi
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c