Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avcodec/h261: move b_stride/b_xy under the if() where they are used

Browse source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-26 03:36:24 +01:00
parent 6795dcfa65
commit c05065aac0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/h261dec.c
View file

@ -341,8 +341,7 @@ static int h261_decode_block(H261Context *h, int16_t *block, int n, int coded)
static int h261_decode_mb(H261Context *h) static int h261_decode_mb(H261Context *h)
{ {
MpegEncContext *const s = &h->s; MpegEncContext *const s = &h->s;
int i, cbp, xy, b_xy; int i, cbp, xy;
int b_stride = 2*s->mb_width + 1;
cbp = 63; cbp = 63;
// Read mba // Read mba
@ -375,7 +374,6 @@ static int h261_decode_mb(H261Context *h)
s->mb_x = ((h->gob_number - 1) % 2) * 11 + ((h->current_mba - 1) % 11); s->mb_x = ((h->gob_number - 1) % 2) * 11 + ((h->current_mba - 1) % 11);
s->mb_y = ((h->gob_number - 1) / 2) * 3 + ((h->current_mba - 1) / 11); s->mb_y = ((h->gob_number - 1) / 2) * 3 + ((h->current_mba - 1) / 11);
xy = s->mb_x + s->mb_y * s->mb_stride; xy = s->mb_x + s->mb_y * s->mb_stride;
b_xy = 2 * s->mb_x + (2 * s->mb_y) * b_stride;
ff_init_block_index(s); ff_init_block_index(s);
ff_update_block_index(s); ff_update_block_index(s);
@ -435,6 +433,8 @@ static int h261_decode_mb(H261Context *h)
s->mv[0][0][1] = h->current_mv_y * 2; s->mv[0][0][1] = h->current_mv_y * 2;
if (s->current_picture.motion_val[0]) { if (s->current_picture.motion_val[0]) {
int b_stride = 2*s->mb_width + 1;
int b_xy = 2 * s->mb_x + (2 * s->mb_y) * b_stride;
s->current_picture.motion_val[0][b_xy][0] = s->mv[0][0][0]; s->current_picture.motion_val[0][b_xy][0] = s->mv[0][0][0];
s->current_picture.motion_val[0][b_xy][1] = s->mv[0][0][1]; s->current_picture.motion_val[0][b_xy][1] = s->mv[0][0][1];
} }