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

Merge commit '2e661f26' 


* commit '2e661f26':
  avconv: insert extra filters in the same way for both graph inputs and outputs

Conflicts:
	ffmpeg_filter.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents bb5ef961 2e661f26
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 12 additions and 14 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