-
Michael Niedermayer authored
* commit 'be101bc1': avconv: create the complex filtergraphs earlier Conflicts: ffmpeg_opt.c Merged-by:
Michael Niedermayer <michael@niedermayer.cc>
c7dd2365
* commit 'be101bc1': avconv: create the complex filtergraphs earlier Conflicts: ffmpeg_opt.c Merged-by:Michael Niedermayer <michael@niedermayer.cc>