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)
commitcf10616cc0db272bab9206a2f0f921f965e379da
tree0e07c43b424aa57a4af008c332ac3aca7a75e90a
parent4e469842b5254dda261223a23e53c5a0f539544d
parent7a03145ed7cb4f1ce794b5126559dd6f38029243
Merge commit '7a03145ed7cb4f1ce794b5126559dd6f38029243'

* commit '7a03145ed7cb4f1ce794b5126559dd6f38029243':
  x86: dsputil: int --> ptrdiff_t for ff_put_pixels16_mmxext line_size param

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