* commit 'c3a0b3eb':
  arm: build: Maintain decoder objects separate from infrastructure objects

Conflicts:
	libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>