doc/ffmpeg.texi
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Jan 2012 22:01:34 +0000 (23:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Jan 2012 22:01:34 +0000 (23:01 +0100)
commit2f3a86a7613757bf3aa6352d6dc4741e0419108e
tree85c644d86f197fdc8aa4bbfe456636ea189fbf07
parent935c659c030f7aaf9bd99c19f2a51863ef83f002
doc/ffmpeg.texi

Merge changes from avconv.texi since the last merge into ffmpeg.texi

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