[FFmpeg-cvslog] Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 10 13:51:07 2012 +0200| [b7ebb49d035205bcfbcc4f1788df5ba1419fadc8] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7ebb49d035205bcfbcc4f1788df5ba1419fadc8
---