Merge commit '01a550bda29eb05fb230576e5223034974aa3396' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:33:24 +0000 (20:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:33:48 +0000 (20:33 +0200)
commit75ff0e8c50d12c40170a21479ac07f573952cdf2
treeaa80ba90519d368f637ec168d65a627a605205b6
parentf02221d65143aa9a5719fa83f159daaa1308b6a0
parent01a550bda29eb05fb230576e5223034974aa3396
Merge commit '01a550bda29eb05fb230576e5223034974aa3396' into release/2.2

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

Conflicts:
libavfilter/f_select.c

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