Michael Niedermayer 215c2fe0ae Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995' ...

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

Conflicts:
	ffmpeg.c

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

2015-03-20 20:33:27 +01:00

145 KiB

Raw Blame History

View Raw