* qatar/master:
  x86: Remove unused inline asm instruction defines
  vc1: Remove now unused variables
Merged-by: Michael Niedermayer <michaelni@gmx.at>