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

doc/ffmpeg.texi: merge changes from avconv.texi since last merge 


Signed-off-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parent 0aa793a1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 16 additions and 11 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