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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 12 23:38:41 2013 +0200| [34b78ad04fe3b46a4658f011c776550110be7dc0] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Move some ifdefs to avoid unused variable warnings

Conflicts:
	libavcodec/x86/dsputil_mmx.c

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

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