[FFmpeg-cvslog] Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  2 20:17:36 2013 +0100| [6f9be8120d2933268733eded5d6c0eb92341e788] | committer: Michael Niedermayer

Merge commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276'

* commit '5a9fcc7d2524d6c0f86b2855019ee9f4cf360276':
  build: Add rule for building host-specific object files

Conflicts:
	Makefile

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

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