[FFmpeg-cvslog] Merge commit '17f5171cd4753e7f50e6d95df069bccbc90265bf'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 23:29:52 2017 -0300| [507e3f7d26ce7ad75ff146748ae285a8dee3b924] | committer: James Almer

Merge commit '17f5171cd4753e7f50e6d95df069bccbc90265bf'

* commit '17f5171cd4753e7f50e6d95df069bccbc90265bf':
  arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp
  lavc: fix hw_device_ctx operation

This commit is a noop, see
48e4eda11d537c6ed52d1000aaa6ce5cbb641e25
f1fd12ef858cf7efe843aa3063894a11b2d1e7d5

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

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