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

Merge commit 'eac3ac1fe0774b65316852616b2672702dbc3f31'

Browse Source 
* commit 'eac3ac1fe0774b65316852616b2672702dbc3f31':
  hevc: eliminate an unneeded intermediate variable

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-11-17 12:12:55 +01:00
commit 91a9ae5b6b
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/hevc.c
View File

@ -1599,7 +1599,6 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
int min_cb_width = s->sps->min_cb_width;
int x_cb = x0 >> log2_min_cb_size;
int y_cb = y0 >> log2_min_cb_size;
int ref_idx[2];
int x_pu, y_pu;
int i, j;
@ -1627,8 +1626,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
if (inter_pred_idc != PRED_L1) {
if (s->sh.nb_refs[L0]) {
ref_idx[0] = ff_hevc_ref_idx_lx_decode(s, s->sh.nb_refs[L0]);
current_mv.ref_idx[0] = ref_idx[0];
current_mv.ref_idx[0]= ff_hevc_ref_idx_lx_decode(s, s->sh.nb_refs[L0]);
}
current_mv.pred_flag = PF_L0;
ff_hevc_hls_mvd_coding(s, x0, y0, 0);
@ -1642,8 +1640,7 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
if (inter_pred_idc != PRED_L0) {
if (s->sh.nb_refs[L1]) {
ref_idx[1] = ff_hevc_ref_idx_lx_decode(s, s->sh.nb_refs[L1]);
current_mv.ref_idx[1] = ref_idx[1];
current_mv.ref_idx[1]= ff_hevc_ref_idx_lx_decode(s, s->sh.nb_refs[L1]);
}
if (s->sh.mvd_l1_zero_flag == 1 && inter_pred_idc == PRED_BI) {