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)
commit8c9a23833daa88bdf08b7e7fbf3a64ab689ad373
treeecdb205fb493ab58ede85c5614e7b70193902cf7
parentc054cff87a3329a1e55abc9cd2659f790f09678e
parent63be97ec403023fb664798432acedaf6e6922527
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>