Merge commit '3fd22538bc0e0de84b31335266b4b1577d3d609e'
authorJames Almer <jamrial@gmail.com>
Sun, 19 Mar 2017 18:30:13 +0000 (15:30 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 19 Mar 2017 18:30:13 +0000 (15:30 -0300)
commit663640d745279a272398283d8dca7efa356c8fe8
tree6a12837dd212c0d46423a5d7a77d6658136ebaa6
parentaec42ebc27c46625fb7fac9d5717056044ecac92
parent3fd22538bc0e0de84b31335266b4b1577d3d609e
Merge commit '3fd22538bc0e0de84b31335266b4b1577d3d609e'

* commit '3fd22538bc0e0de84b31335266b4b1577d3d609e':
  prores: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
libavcodec/proresdsp.c
libavcodec/proresdsp.h
libavcodec/proresenc_kostya.c
libavcodec/x86/proresdsp_init.c
libavcodec/x86/simple_idct10_template.asm