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

Merge commit 'dc574658' 


* commit 'dc574658':
  avconv: print filter options in -h full output.

Conflicts:
	ffmpeg_opt.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 7b6c0bda dc574658
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
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