* commit '205a4502':
  doc: Clarify the avconv section about -re

Conflicts:
	doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>