Commit 8c9a2383 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '63be97ec'

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

not merged, this is incorrect
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c054cff8 63be97ec
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment