Merge commit '802727b538b484e3f9d1345bfcc4ab24cfea8898'

* commit '802727b538b484e3f9d1345bfcc4ab24cfea8898':
  vp8: Update some assembly comments left unchanged in bd66f073fe7286bd3c

Merged-by: James Almer <jamrial@gmail.com>

diff --cc libavcodec/arm/vp8dsp_armv6.S
Simple merge

diff --cc libavcodec/x86/vp8dsp.asm
index ea6dcf6179e66ec8d01fde211a9d3cc65a441350,b0f6b83767e407adf4055b6edc309c5e8d692a83..e303b802938e46afe52816d509b8513e53bf961b
--- 1/libavcodec/x86/vp8dsp.asm
--- 2/libavcodec/x86/vp8dsp.asm
+++ b/libavcodec/x86/vp8dsp.asm
@@@ -962,24 -959,10 +962,24 @@@ cglobal vp8_idct_dc_add, 3, 3, 6, dst, 
      pextrd [dst1q+strideq], m2, 1
      pextrd [dst2q], m2, 2
      pextrd [dst2q+strideq], m2, 3
 +%else
 +    psrldq     m2, 4
 +    movd [dst1q+strideq], m2
 +    psrldq     m2, 4
 +    movd [dst2q], m2
 +    psrldq     m2, 4
 +    movd [dst2q+strideq], m2
 +%endif
      RET
 +%endmacro
 +
 +INIT_XMM sse2
 +VP8_IDCT_DC_ADD
 +INIT_XMM sse4
 +VP8_IDCT_DC_ADD
  
  ;-----------------------------------------------------------------------------
- ; void ff_vp8_idct_dc_add4y_<opt>(uint8_t *dst, int16_t block[4][16], int stride);
+ ; void ff_vp8_idct_dc_add4y_<opt>(uint8_t *dst, int16_t block[4][16], ptrdiff_t stride);
  ;-----------------------------------------------------------------------------
  
  %if ARCH_X86_32

diff --cc libavcodec/x86/vp8dsp_loopfilter.asm
Simple merge