Merge changes from avconv.texi since the last merge into ffmpeg.texi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>