Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Sep 2012 15:41:17 +0000 (17:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Sep 2012 15:41:17 +0000 (17:41 +0200)
commitb0dc4286a960a8a6e87ef7904006f7948a5af6b0
treed1d90bc46d022d4cb070f9f7696712d3a66c0e12
parent5d5583038866cbc2280b893c39e1885d77fdf243
parenteb239a577fcf1f19cdaa7aeb6e6586a172ee59c1
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@gmx.at>
libavcodec/Makefile
libavcodec/intrax8dsp.h