Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Aug 2013 10:49:54 +0000 (12:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 30 Aug 2013 10:50:01 +0000 (12:50 +0200)
commit62a6052974d89e5463f21930d46c69fab3f0d804
tree864406a6240c60572f70c3bff4e941cb013f5729
parent7fb758cd8ed08e4a37f10e25003953d13c68b8cd
parente998b56362c711701b3daa34e7b956e7126336f4
Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/mpegaudiodsp.c
libavcodec/x86/mpegvideo.c
libavcodec/x86/rv40dsp_init.c