-
Michael Niedermayer authored
* commit '227cfc1f': vf_frei0r: adjust error messages Conflicts: libavfilter/vf_frei0r.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
f67e75b5
* commit '227cfc1f': vf_frei0r: adjust error messages Conflicts: libavfilter/vf_frei0r.c Merged-by:Michael Niedermayer <michaelni@gmx.at>