Merge commit '17f5171cd4753e7f50e6d95df069bccbc90265bf'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 02:29:52 +0000 (23:29 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 02:29:52 +0000 (23:29 -0300)
* 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@gmail.com>

Trivial merge