[FFmpeg-cvslog] Merge commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Oct 11 18:32:30 2017 -0300| [9244524177b568d0da8f26cb88ab338b2ca6e475] | committer: James Almer

Merge commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255'

* commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255':
  configure: Fix typo in objcc default setting
  x86: hevc: Add missing colons after assembly labels

This commit is a noop.

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

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