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

hevc: reduce variable scope

Browse Source 
Also, collapse the array into a scalar, since only one value is needed
at a time.
This commit is contained in:
Anton Khirnov 2014-11-16 08:13:46 +01:00
parent 84c0ece5fd
commit eb335f3c5c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/hevc.c
View File

@ -1648,7 +1648,6 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
int x_cb = x0 >> log2_min_cb_size;
int y_cb = y0 >> log2_min_cb_size;
int ref_idx[2];
int mvp_flag[2];
int x_pu, y_pu;
int i, j;
@ -1667,6 +1666,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
partIdx, merge_idx, &current_mv);
} else {
enum InterPredIdc inter_pred_idc = PRED_L0;
int mvp_flag;
ff_hevc_set_neighbour_available(s, x0, y0, nPbW, nPbH);
if (s->sh.slice_type == B_SLICE)
inter_pred_idc = ff_hevc_inter_pred_idc_decode(s, nPbW, nPbH);
@ -1678,10 +1679,10 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
}
current_mv.pred_flag[0] = 1;
hls_mvd_coding(s, x0, y0, 0);
mvp_flag[0] = ff_hevc_mvp_lx_flag_decode(s);
mvp_flag = ff_hevc_mvp_lx_flag_decode(s);
ff_hevc_luma_mv_mvp_mode(s, x0, y0, nPbW, nPbH, log2_cb_size,
partIdx, merge_idx, &current_mv,
mvp_flag[0], 0);
mvp_flag, 0);
current_mv.mv[0].x += lc->pu.mvd.x;
current_mv.mv[0].y += lc->pu.mvd.y;
}
@ -1699,10 +1700,10 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
}
current_mv.pred_flag[1] = 1;
mvp_flag[1] = ff_hevc_mvp_lx_flag_decode(s);
mvp_flag = ff_hevc_mvp_lx_flag_decode(s);
ff_hevc_luma_mv_mvp_mode(s, x0, y0, nPbW, nPbH, log2_cb_size,
partIdx, merge_idx, &current_mv,
mvp_flag[1], 1);
mvp_flag, 1);
current_mv.mv[1].x += lc->pu.mvd.x;
current_mv.mv[1].y += lc->pu.mvd.y;
}