Merge commit 'e5ffffe48d20642acc079166f0fa7d93a6a9f594'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 09:57:31 +0000 (10:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Feb 2013 09:57:47 +0000 (10:57 +0100)
* commit 'e5ffffe48d20642acc079166f0fa7d93a6a9f594':
  h264chroma: Remove duplicate 9/10 bit functions
  x86: Use simple nop codes for <= sse (rather than <= mmx)
  vp56: Remove clear_blocks call, and clear alpha plane U/V DC only

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

Trivial merge