Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 12:12:11 +0000 (14:12 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 12:12:11 +0000 (14:12 +0200)
commitc7dd2365f432cf8338596a37e04556b66889d3e2
treed643b2ed947ee9e8eb5e4ae8bf4f64adc918ac29
parent3b0534efdcde122ace74196be8c22afd9b03c017
parentbe101bc1e357c50fcb740bc4870b3bacc93a5727
Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'

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

Conflicts:
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
ffmpeg_opt.c