Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 11:50:45 +0000 (12:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Mar 2014 12:17:25 +0000 (13:17 +0100)
commitbfe03205a86c63edd4246a51f70284a2874ea352
treed63fbed9d91c365ee503a0dc35a99584c40397a7
parent2b0ff8d6424fa8e5c8dd69e9176be07b40e035ab
parent4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e
Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/vf_frei0r.c