Commit 7994c1cd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'a8d803a3'

* commit 'a8d803a3':
  vf_select: Drop a debug av_log with an unchecked double to enum conversion

Conflicts:
	libavfilter/f_select.c

Not merged, see next commit for the bugfix
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 91244073 a8d803a3
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