Merge commit '63be97ec403023fb664798432acedaf6e6922527'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:15:40 +0000 (05:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 04:28:09 +0000 (05:28 +0100)
* commit '63be97ec403023fb664798432acedaf6e6922527':
  lavfi: always check av_expr_parse_and_eval() return value

not merged, this is incorrect

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

Trivial merge