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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep  2 21:00:15 2012 +0200| [50b0edea9f48c831909313c15b0677957789ff53] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  intrax8: move functions from dsputil to own context

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

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