Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995'
* commit '22a6d48b0d7367b3a45dd6db245f8ffaaa364995': avconv: Print the avfilter errors Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
- Loading branch information