* qatar/master:
  swscale: Remove unused variable.
  ARM: simplify inline asm with 64-bit operands
Merged-by: Michael Niedermayer <michaelni@gmx.at>