Merge commit '96753bd00d6d4046db6818c0aadc21bf2a11d77b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jan 2013 15:29:57 +0000 (16:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Jan 2013 15:30:01 +0000 (16:30 +0100)
commitf5c0b9aa6f3843d33961981aa16317d05d74e9dc
tree06a695f4e3663d4310bdbc3eed0906de92920f25
parentedde562130feb901f29d7cef930c4b5b133661b9
parent96753bd00d6d4046db6818c0aadc21bf2a11d77b
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@gmx.at>
libavcodec/h264.c
libavcodec/mpegvideo.c