diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-11 18:50:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-11 18:50:39 +0100 |
| commit | 616eaea8ad0becdeeb75a783e8924a1aa12309ec (patch) | |
| tree | 05df3f5e0a7fb88c01a1691b0e5498455ef8e6f4 /ffmpeg.c | |
| parent | c3068d43a8cbca576b9a9bb963dd95b4c24c6e38 (diff) | |
| download | ffmpeg-616eaea8ad0becdeeb75a783e8924a1aa12309ec.tar.gz | |
doc/ffmpeg.texi
Merge changes done to avconv.texi since the last merge into ffmpeg.texi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions