Merge commit '76e9a17f3392e752193015765e9216c2f0716b96' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 22:07:18 +0000 (23:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 22:07:18 +0000 (23:07 +0100)
commit98d4a07ccf97696c6b7e38e6b0e04e8fd5eba9c3
tree7a09b00b64f0ffc2e92ad60c577631d141fe0613
parent3cc8822c93e97e61308f440e62766f16819aad77
parent76e9a17f3392e752193015765e9216c2f0716b96
Merge commit '76e9a17f3392e752193015765e9216c2f0716b96' into release/2.4

* commit '76e9a17f3392e752193015765e9216c2f0716b96':
  lavfi: always check av_expr_parse_and_eval() return value

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