Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Dec 2013 10:55:38 +0000 (11:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Dec 2013 10:55:41 +0000 (11:55 +0100)
* qatar/master:
  x86: Initialize mmxext after amd3dnow optimizations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/cavsdsp.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/hpeldsp_init.c

Simple merge
Simple merge
Simple merge