doc/ffmpeg.texi

Merge changes done to avconv.texi since the last merge into ffmpeg.texi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-12-11 18:50:39 +01:00
parent c3068d43a8
commit 616eaea8ad