Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Feb 2013 09:54:27 +0000 (10:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Feb 2013 09:59:05 +0000 (10:59 +0100)
commitdb05f7ab1626a175ec1aea2d1d64e2e49b632753
treef3a8fc715399ce5dd1a9b0d3384474ea18fff223
parentb16bf913d8edacc368913fdaa92a23ae7d18d193
parent311443f6c7eb230276e320f2d30a5d729cf32b76
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: h264: Don't use redzone in AVX h264_deblock on Win64

No code change, as the commit has been already integrated
merge just for metadata

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