[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 16:24:07 2013 +0200| [0dd25e46996d648a7718c32e91cb5985b333963f] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Remove unused inline asm instruction defines
  vc1: Remove now unused variables

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0dd25e46996d648a7718c32e91cb5985b333963f
---