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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 19 12:41:27 2013 +0100| [fa09ad5c9e68bda47efddd357ed4715f7dab563b] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Fix h263 loop filter link error in some configurations

Conflicts:
	libavcodec/x86/dsputil.asm

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

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