virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/indeo3: Constify ref_block in decode_cell_data()

Browse Source 
Also use smaller scope while just at it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-06-22 22:45:08 +02:00
parent 41d86b5be5
commit 134c1d81a4
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/indeo3.c
View File

@ -429,14 +429,13 @@ if (*data_ptr >= last_ptr) \
static int decode_cell_data(Indeo3DecodeContext *ctx, Cell *cell, static int decode_cell_data(Indeo3DecodeContext *ctx, Cell *cell,
uint8_t *block, uint8_t *ref_block, uint8_t *block, const uint8_t *ref_block,
ptrdiff_t row_offset, int h_zoom, int v_zoom, int mode, ptrdiff_t row_offset, int h_zoom, int v_zoom, int mode,
const vqEntry *delta[2], int swap_quads[2], const vqEntry *delta[2], int swap_quads[2],
const uint8_t **data_ptr, const uint8_t *last_ptr) const uint8_t **data_ptr, const uint8_t *last_ptr)
{ {
int x, y, line, num_lines; int x, y, line, num_lines;
int rle_blocks = 0; int rle_blocks = 0;
uint8_t code, *dst, *ref;
const vqEntry *delta_tab; const vqEntry *delta_tab;
unsigned int dyad1, dyad2; unsigned int dyad1, dyad2;
uint64_t pix64; uint64_t pix64;
@ -450,8 +449,8 @@ static int decode_cell_data(Indeo3DecodeContext *ctx, Cell *cell,
for (y = 0; y < cell->height; is_first_row = 0, y += 1 + v_zoom) { for (y = 0; y < cell->height; is_first_row = 0, y += 1 + v_zoom) {
for (x = 0; x < cell->width; x += 1 + h_zoom) { for (x = 0; x < cell->width; x += 1 + h_zoom) {
ref = ref_block; const uint8_t *ref = ref_block;
dst = block; uint8_t *dst = block;
if (rle_blocks > 0) { if (rle_blocks > 0) {
if (mode <= 4) { if (mode <= 4) {
@ -471,7 +470,7 @@ static int decode_cell_data(Indeo3DecodeContext *ctx, Cell *cell,
else else
delta_tab = delta[1]; delta_tab = delta[1];
BUFFER_PRECHECK; BUFFER_PRECHECK;
code = bytestream_get_byte(data_ptr); uint8_t code = bytestream_get_byte(data_ptr);
if (code < 248) { if (code < 248) {
if (code < delta_tab->num_dyads) { if (code < delta_tab->num_dyads) {
BUFFER_PRECHECK; BUFFER_PRECHECK;