Include FFMPEG codec configuration

Change-Id: Id59290da078c55a97bbaf0ea27e0dfd769f28578

Conflicts:
	config/media_codecs.xml