Merge commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Nov 2013 21:47:08 +0000 (22:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Nov 2013 21:47:37 +0000 (22:47 +0100)
commit3adb825650965492f5f874c027b426c0077b523d
tree57dbfb3f44c8f6362c55b7d1ba523d730ad92ed1
parentf21ca39e8156c7957348bf37e9dc9d311488ae14
parentcf7860db608df7c76471d8b61f07abbd5aad8dd5
Merge commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5'

* commit 'cf7860db608df7c76471d8b61f07abbd5aad8dd5':
  x86: dsputil: Suppress deprecation warnings for XvMC bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputil_init.c