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)
* qatar/master:
  swscale: Remove unused variable.
  ARM: simplify inline asm with 64-bit operands

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

Simple merge
Simple merge