[FFmpeg-cvslog] Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 19 14:12:11 2015 +0200| [c7dd2365f432cf8338596a37e04556b66889d3e2] | committer: Michael Niedermayer

Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'

* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727':
  avconv: create the complex filtergraphs earlier

Conflicts:
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7dd2365f432cf8338596a37e04556b66889d3e2
---