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)
* 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>

Trivial merge