[FFmpeg-cvslog] Merge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 24 00:26:46 2014 +0100| [3bf5c05925b53a02e59fd8f74df8947731411216] | committer: Michael Niedermayer

Merge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'

* commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4':
  build: Sort h264 objects

Conflicts:
	libavcodec/Makefile

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

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