[FFmpeg-cvslog] Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  8 14:08:00 2013 +0200| [69d2eff5af67e9bc461f64dfd3014009f5c851b2] | committer: Michael Niedermayer

Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'

* commit '63bac48f734fc69cca2ef2cfada92cd9a222734d':
  x86: dsputil: Move rv40-specific functions where they belong

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/dsputil_mmx.h

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

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