From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 4 Mar 2014 11:50:45 +0000 (+0100)
Subject: Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'
X-Git-Tag: android-x86-6.0-r1~6888
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bfe03205a86c63edd4246a51f70284a2874ea352;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'

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

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

bfe03205a86c63edd4246a51f70284a2874ea352