Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 15:32:15 +0000 (17:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 15:32:15 +0000 (17:32 +0200)
commit7994c1cd760838ca5b92401caa1994bc035d08b5
treed4675355588799c91ff395935d1bff24208f1989
parent91244073fd8b983e7cd1f97da83daf956fbbddc6
parenta8d803a320fb08b3ad5db4fffc79abd401206905
Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905'

* commit 'a8d803a320fb08b3ad5db4fffc79abd401206905':
  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: Michael Niedermayer <michaelni@gmx.at>