Merge commit '17f5171c'

* commit '17f5171c':
  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
48e4eda1
f1fd12efMerged-by: James Almer <jamrial@gmail.com>