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

Tue May 31 02:20:07 CEST 2011

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 31 02:08:13 2011 +0200| [40c29d42cfe5615b9e382b89f5bcba7a2d62cd29] | committer: Michael Niedermayer

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 at gmx.at>

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