[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 16:15:50 2013 +0200| [f896f92337e71cc7dd3d4d2c37c8b04435e37d15] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  cosmetics: Place arch initialization calls in alphabetical order

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

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