[FFmpeg-cvslog] Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar  4 12:41:31 2014 +0100| [2b0ff8d6424fa8e5c8dd69e9176be07b40e035ab] | committer: Michael Niedermayer

Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'

* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9':
  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=2b0ff8d6424fa8e5c8dd69e9176be07b40e035ab
---