[FFmpeg-cvslog] Merge commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Apr 13 19:56:17 2017 -0300| [41b394bc612b0b96a8f015ac716ded6ef0ca9e0f] | committer: James Almer

Merge commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390'

* commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390':
  vf_hwupload_cuda: Add min/max limits for device option

This commit is a noop, see4df5a6a26a8aa08bbc6d027c2fb44fcf870e98d7

Merged-by: James Almer <jamrial at gmail.com>

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