[FFmpeg-cvslog] Merge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 10:08:17 2013 +0200| [84bc317019ba5c35355592df64d152f2cff76339] | committer: Michael Niedermayer

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 at gmx.at>

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