Michael Niedermayer b0dc4286a9 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>

2012-09-03 17:41:17 +02:00

1.3 KiB

Raw Blame History

View Raw