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

Merge commit '5c7db097' 


* commit '5c7db097':
  avconv: pass libavresample options to AVFilterGraph

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 71cf094e 5c7db097
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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