Skip to content
Snippets Groups Projects
Commit 2f3a86a7 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

doc/ffmpeg.texi 


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

Signed-off-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parent 935c659c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 31 additions and 9 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment