Merge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 08:08:17 +0000 (10:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 08:08:17 +0000 (10:08 +0200)
commit84bc317019ba5c35355592df64d152f2cff76339
treed6af05816cb1074f767260ddb10293c735b919cc
parentbb5ef961647f06425eff236d9575db0ab6ae66f1
parent2e661f26f8b12195f75ae3b07d9591e395135bc7
Merge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7'

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

Conflicts:
ffmpeg_filter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_filter.c