[FFmpeg-cvslog] Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar 20 20:33:27 2015 +0100| [215c2fe0ae2a5105439c7abb484bc0ef1fc22934] | committer: Michael Niedermayer

Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'

* commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995':
  avconv: Print the avfilter errors

Conflicts:
	ffmpeg.c

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

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