Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -324,7 +324,7 @@ static inline uint32_t replicate32(uint32_t a) { · 323 unmodified lines | |||
| 324 | 324 | ||
| 325 | /* Fill n lines with 64-bit pixel value pix */ | 325 | /* Fill n lines with 64-bit pixel value pix */ |
| 326 | static inline void fill_64(uint8_t *dst, const uint64_t pix, int32_t n, | 326 | static inline void fill_64(uint8_t *dst, const uint64_t pix, int32_t n, |
| 327 | int32_t row_offset) | 327 | ptrdiff_t row_offset) |
| 328 | { | 328 | { |
| 329 | for (; n > 0; dst += row_offset, n--) | 329 | for (; n > 0; dst += row_offset, n--) |
| 330 | AV_WN64A(dst, pix); | 330 | AV_WN64A(dst, pix); |
| @@ -441,10 +441,9 @@ static int decode_cell_data(Indeo3DecodeContext *ctx, Cell *cell, · 110 unmodified lines | |||
| 441 | unsigned int dyad1, dyad2; | 441 | unsigned int dyad1, dyad2; |
| 442 | uint64_t pix64; | 442 | uint64_t pix64; |
| 443 | int skip_flag = 0, is_top_of_cell, is_first_row = 1; | 443 | int skip_flag = 0, is_top_of_cell, is_first_row = 1; |
| 444 | int blk_row_offset, line_offset; | ||
| 445 | 444 | ||
| 446 | blk_row_offset = (row_offset << (2 + v_zoom)) - (cell->width << 2); | 445 | const ptrdiff_t blk_row_offset = (row_offset << (2 + v_zoom)) - (cell->width << 2); |
| 447 | line_offset = v_zoom ? row_offset : 0; | 446 | const ptrdiff_t line_offset = v_zoom ? row_offset : 0; |
| 448 | 447 | ||
| 449 | if (cell->height & v_zoom || cell->width & h_zoom) | 448 | if (cell->height & v_zoom || cell->width & h_zoom) |
| 450 | return IV3_BAD_DATA; | 449 | return IV3_BAD_DATA; |