Merge commit '570d4b21863b6254d6bbca9c528bede471bb4478'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jun 2014 16:34:38 +0000 (18:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jun 2014 16:35:49 +0000 (18:35 +0200)
* commit '570d4b21863b6254d6bbca9c528bede471bb4478':
  x86: h264: Don't keep data in the redzone across function calls on 64 bit unix

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

Simple merge