Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 14:13:53 +0000 (16:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Oct 2013 14:13:57 +0000 (16:13 +0200)
* qatar/master:
  x86: more AVX2 framework

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/x86/x86inc.asm

Simple merge