From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 19 Dec 2014 04:15:40 +0000 (+0100)
Subject: Merge commit '63be97ec403023fb664798432acedaf6e6922527'
X-Git-Tag: n2.7-dev~1494
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/8c9a23833daa88bdf08b7e7fbf3a64ab689ad373

Merge commit '63be97ec403023fb664798432acedaf6e6922527'

* commit '63be97ec403023fb664798432acedaf6e6922527':
  lavfi: always check av_expr_parse_and_eval() return value

not merged, this is incorrect

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

8c9a23833daa88bdf08b7e7fbf3a64ab689ad373