Merge commit '7a03145ed7cb4f1ce794b5126559dd6f38029243'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Feb 2013 11:32:04 +0000 (12:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Feb 2013 11:32:12 +0000 (12:32 +0100)
* commit '7a03145ed7cb4f1ce794b5126559dd6f38029243':
  x86: dsputil: int --> ptrdiff_t for ff_put_pixels16_mmxext line_size param

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

Simple merge