diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-21 15:20:45 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-21 15:20:45 -0300 |
| commit | a8474df9447d6466c77d3ec8f414cda2662f057b (patch) | |
| tree | 508b0b6cbb90c13e0a9ff44023f5df96b21420fd /libavcodec/vc1dsp.c | |
| parent | 5a49097b42cbc3eab888d15a91eeaf5520b5c381 (diff) | |
| parent | e4a94d8b36c48d95a7d412c40d7b558422ff659c (diff) | |
Merge commit 'e4a94d8b36c48d95a7d412c40d7b558422ff659c'
* commit 'e4a94d8b36c48d95a7d412c40d7b558422ff659c':
h264chroma: Change type of stride parameters to ptrdiff_t
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/vc1dsp.c')
| -rw-r--r-- | libavcodec/vc1dsp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c index eaadebe6d0..9239a4a1f5 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -782,7 +782,7 @@ PUT_VC1_MSPEL(3, 3) C * src[stride + a] + D * src[stride + a + 1] + 32 - 4) >> 6) static void put_no_rnd_vc1_chroma_mc8_c(uint8_t *dst /* align 8 */, uint8_t *src /* align 1 */, - int stride, int h, int x, int y) + ptrdiff_t stride, int h, int x, int y) { const int A = (8 - x) * (8 - y); const int B = (x) * (8 - y); @@ -807,7 +807,7 @@ static void put_no_rnd_vc1_chroma_mc8_c(uint8_t *dst /* align 8 */, } static void put_no_rnd_vc1_chroma_mc4_c(uint8_t *dst, uint8_t *src, - int stride, int h, int x, int y) + ptrdiff_t stride, int h, int x, int y) { const int A = (8 - x) * (8 - y); const int B = (x) * (8 - y); @@ -830,7 +830,7 @@ static void put_no_rnd_vc1_chroma_mc4_c(uint8_t *dst, uint8_t *src, #define avg2(a, b) (((a) + (b) + 1) >> 1) static void avg_no_rnd_vc1_chroma_mc8_c(uint8_t *dst /* align 8 */, uint8_t *src /* align 1 */, - int stride, int h, int x, int y) + ptrdiff_t stride, int h, int x, int y) { const int A = (8 - x) * (8 - y); const int B = (x) * (8 - y); @@ -856,7 +856,7 @@ static void avg_no_rnd_vc1_chroma_mc8_c(uint8_t *dst /* align 8 */, static void avg_no_rnd_vc1_chroma_mc4_c(uint8_t *dst /* align 8 */, uint8_t *src /* align 1 */, - int stride, int h, int x, int y) + ptrdiff_t stride, int h, int x, int y) { const int A = (8 - x) * (8 - y); const int B = ( x) * (8 - y); |