[FFmpeg-cvslog] hevc: reduce variable scope
Anton Khirnov
git at videolan.org
Mon Nov 17 12:12:58 CET 2014
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Nov 16 08:13:46 2014 +0100| [eb335f3c5ce37f2b93c993e28404d113bee843bc] | committer: Anton Khirnov
hevc: reduce variable scope
Also, collapse the array into a scalar, since only one value is needed
at a time.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eb335f3c5ce37f2b93c993e28404d113bee843bc
---
libavcodec/hevc.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 2cbb35f..61ba0f0 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -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, ¤t_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, ¤t_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, ¤t_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;
}
More information about the ffmpeg-cvslog
mailing list