[FFmpeg-cvslog] Merge commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 27 16:29:57 2013 +0100| [f5c0b9aa6f3843d33961981aa16317d05d74e9dc] | committer: Michael Niedermayer

Merge commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b'

* commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b':
  dsputil: x86: Correct the number of registers used in put_no_rnd_pixels16_l2
  dsputil: add missing HAVE_YASM guard
  hwaccel: do not offer unsupported pixel formats
  vdpau: add missing pixel format for H.264

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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