* commit 'ede2b451':
  build: Sort h264 objects

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