[FFmpeg-cvslog] Merge commit '63be97ec403023fb664798432acedaf6e6922527'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 19 05:15:40 2014 +0100| [8c9a23833daa88bdf08b7e7fbf3a64ab689ad373] | committer: Michael Niedermayer

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 at gmx.at>

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