[FFmpeg-cvslog] Merge commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 27 20:10:51 2014 +0100| [68014c6ed98b5c90f4dc211429dd269ac727be4b] | committer: Michael Niedermayer

Merge commit 'c3a0b3eb64be441ca897629e8ecd80d5b51fded7'

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

Conflicts:
	libavcodec/arm/Makefile

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

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