Merge commit '6d592fbd'
* commit '6d592fbd': avconv: split creating and (re-)configuring complex filtergraphs Conflicts: ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Showing
Please
register
or
sign in
to comment