[FFmpeg-cvslog] Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar  4 12:50:45 2014 +0100| [bfe03205a86c63edd4246a51f70284a2874ea352] | committer: Michael Niedermayer

Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'

* commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e':
  vf_frei0r: prevent a segfault when filter parameters are not set

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bfe03205a86c63edd4246a51f70284a2874ea352
---