Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Mar 2015 19:33:27 +0000 (20:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Mar 2015 19:33:27 +0000 (20:33 +0100)
commit215c2fe0ae2a5105439c7abb484bc0ef1fc22934
treeb270e219fca32d3d69bf28ea94336dc6430cae58
parent50255b7a865f0dd4fecf8d1e337f96b92b4b406e
parent22a6d48b0d7367b3a45dd6db245f8ffaaa364995
Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'

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

Conflicts:
ffmpeg.c

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