[FFmpeg-cvslog] Merge commit '37961044c6'

Tue Jan 24 20:33:40 EET 2017

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Tue Jan 24 19:32:12 2017 +0100| [f84ece0a9831cbbdc53163eeb81a5d03cd840d70] | committer: Clément Bœsch

Merge commit '37961044c6'

* commit '37961044c6':
  checkasm: arm: Ignore changes to bits 0-4 and 7 of FPSCR
  cheackasm/arm: remove NEON instructions from checkasm_checked_call_vfp
  checkasm: arm: Don't start new const blocks for each string

This merge is a noop: the changes were included in 9f1c81e5ec.

Merged-by: Clément Bœsch <u at pkh.me>

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