* qatar/master:
  avconv: make the ASCII flow charts narrower to fit onto TTY

Conflicts:
	doc/ffmpeg.texi

See: 8fe10760Merged-by: Michael Niedermayer <michaelni@gmx.at>