Merge commit '2d91abade29e43bb45c881d45909b8ee77e904e2'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 09:48:46 +0000 (11:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Oct 2014 09:48:58 +0000 (11:48 +0200)
* commit '2d91abade29e43bb45c881d45909b8ee77e904e2':
  x86: h264_intrapred: Don't treat 32-bit integers as 64-bit

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

Simple merge