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)
commit5b4d57455d5b587fb0141823e2d08c9117ad1817
treecbda11a429baa7ad5ff7f9c8c78270fdcae657ea
parentbe99054e77f1a0380d3597406d042f8e8e52b315
parent3d7c84747d4b68f3929c98a6e09efea8e53634dc
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: Initialize mmxext after amd3dnow optimizations

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