[FFmpeg-cvslog] Merge commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb' into release/2.2
Michael Niedermayer
git at videolan.org
Tue Mar 11 13:12:02 CET 2014
ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 12:16:05 2014 +0100| [f67e75b5dc048adcde38567f4b6cfeaaf0676bbd] | committer: Michael Niedermayer
Merge commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb' into release/2.2
* commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb':
vf_frei0r: adjust error messages
Conflicts:
libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f67e75b5dc048adcde38567f4b6cfeaaf0676bbd
---
More information about the ffmpeg-cvslog
mailing list