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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep  3 17:41:17 2012 +0200| [b0dc4286a960a8a6e87ef7904006f7948a5af6b0] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: avcodec: order cosmetics
  intrax8dsp: Add missing #include to make header standalone
  Delete motion-test tool; it is of doubtful utility.

Conflicts:
	libavcodec/Makefile
	libavcodec/motion-test.c

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

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