]> git.sesse.net Git - ffmpeg/commit
doc/ffmpeg.texi
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Dec 2011 17:50:39 +0000 (18:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Dec 2011 17:50:39 +0000 (18:50 +0100)
commit616eaea8ad0becdeeb75a783e8924a1aa12309ec
tree05df3f5e0a7fb88c01a1691b0e5498455ef8e6f4
parentc3068d43a8cbca576b9a9bb963dd95b4c24c6e38
doc/ffmpeg.texi
Merge changes done to avconv.texi since the last merge into ffmpeg.texi

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