Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 31 May 2011 00:08:13 +0000 (02:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 31 May 2011 00:08:20 +0000 (02:08 +0200)
commit40c29d42cfe5615b9e382b89f5bcba7a2d62cd29
tree8ccd01ce4ee2252abdb96388dff9ea71e9c4ff72
parent3d0424f2ff3ae774d4237954186e4113976827e5
parentf635a233e377bedc6a39c9d8923ee3039fa5319f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: Remove unused variable.
  ARM: simplify inline asm with 64-bit operands

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/mathops.h
libavutil/arm/intreadwrite.h