[FFmpeg-cvslog] Merge commit '002c47798da0c43a053822c8041144798d49ed84'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Feb  3 17:07:47 2016 +0000| [9de85c544aaa0e38f52154e6a6b3a1adc02993c8] | committer: Derek Buitenhuis

Merge commit '002c47798da0c43a053822c8041144798d49ed84'

This is a NOOP.

* commit '002c47798da0c43a053822c8041144798d49ed84':
  x86inc: Avoid creating unnecessary local labels
  x86inc: Simplify AUTO_REP_RET
  x86inc: Use more consistent indentation
  x86inc: Preserve arguments when allocating stack space
  x86inc: Improve FMA instruction handling
  x86inc: Be more verbose in assertion failures
  x86inc: Make cpuflag() and notcpuflag() return 0 or 1

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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