* commit 'fb722a90':
  avconv: remove -same_quant

Conflicts:
	Changelog
	doc/faq.texi
	ffmpeg.c
	ffmpeg.h
	ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>