Merge commit '8b86c2ed2eb29dce137b26e66a9bddd50f72817f' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 01:48:31 +0000 (03:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 01:49:58 +0000 (03:49 +0200)
* commit '8b86c2ed2eb29dce137b26e66a9bddd50f72817f':
  Revert "lavfi: always check av_expr_parse_and_eval() return value"

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

Trivial merge