generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flashsv: improve some variable names

Browse Source
This commit is contained in:
Diego Biurrun 2011-06-30 01:00:10 +02:00
parent 8886d75263
commit 91fe776913
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/flashsv.c
View File

@ -152,14 +152,13 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
/* loop over all block columns */ /* loop over all block columns */
for (j = 0; j < v_blocks + (v_part ? 1 : 0); j++) { for (j = 0; j < v_blocks + (v_part ? 1 : 0); j++) {
int hp = j * s->block_height; // vertical position in frame int y_pos = j * s->block_height; // vertical position in frame
int hs = (j < v_blocks) ? s->block_height : v_part; // block size int cur_blk_height = (j < v_blocks) ? s->block_height : v_part;
/* loop over all block rows */ /* loop over all block rows */
for (i = 0; i < h_blocks + (h_part ? 1 : 0); i++) { for (i = 0; i < h_blocks + (h_part ? 1 : 0); i++) {
int wp = i * s->block_width; // horizontal position in frame int x_pos = i * s->block_width; // horizontal position in frame
int ws = (i < h_blocks) ? s->block_width : h_part; // block size int cur_blk_width = (i < h_blocks) ? s->block_width : h_part;
/* get the size of the compressed zlib chunk */ /* get the size of the compressed zlib chunk */
int size = get_bits(&gb, 16); int size = get_bits(&gb, 16);
@ -195,8 +194,9 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data,
/* return -1; */ /* return -1; */
} }
copy_region(s->tmpblock, s->frame.data[0], copy_region(s->tmpblock, s->frame.data[0],
s->image_height - (hp + hs + 1), s->image_height - (y_pos + cur_blk_height + 1),
wp, hs, ws, s->frame.linesize[0]); x_pos, cur_blk_height, cur_blk_width,
s->frame.linesize[0]);
skip_bits_long(&gb, 8 * size); /* skip the consumed bits */ skip_bits_long(&gb, 8 * size); /* skip the consumed bits */
} }
} }