Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 14:24:07 +0000 (16:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 14:24:15 +0000 (16:24 +0200)
* qatar/master:
  x86: Remove unused inline asm instruction defines
  vc1: Remove now unused variables

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

Simple merge