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

Merge commit '8fc83fb0' 


* commit '8fc83fb0':
  avconv: reformat the options table.

Conflicts:
	ffmpeg_opt.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 93e75c78 8fc83fb0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 242 additions and 127 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