[FFmpeg-cvslog] Merge commit 'a8d803a320fb08b3ad5db4fffc79abd401206905'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 30 17:32:15 2014 +0200| [7994c1cd760838ca5b92401caa1994bc035d08b5] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7994c1cd760838ca5b92401caa1994bc035d08b5
---