[FFmpeg-cvslog] Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 30 12:49:54 2013 +0200| [62a6052974d89e5463f21930d46c69fab3f0d804] | committer: Michael Niedermayer

Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'

* commit 'e998b56362c711701b3daa34e7b956e7126336f4':
  x86: avcodec: Consistently structure CPU extension initialization

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

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