Merge avconv.texi in ffmpeg.texi
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Sep 2011 18:34:19 +0000 (20:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 13 Sep 2011 18:34:19 +0000 (20:34 +0200)
commite29d6db55b96a642c5498794247742020697369a
tree92ff7b7443e7772abfd208de5693e0e0f694d522
parent9331a2ee41d13d04e2eed077f1f934a62288ab01
Merge avconv.texi in ffmpeg.texi

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