diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 11:59:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 13:09:31 +0100 |
| commit | 1a6948fa708d7f0a950f9caa0256e2d73740e924 (patch) | |
| tree | ff6305cb10e9cf7883740dee311a2e42359338e0 /libavcodec/hevc_mvs.c | |
| parent | ce7f1c76bd8fc3b4b2dc013ea7e635ed26a8c9fd (diff) | |
| download | ffmpeg-1a6948fa708d7f0a950f9caa0256e2d73740e924.tar.gz | |
libavcodec/hevc: reduce bracket differences to 064698d381e1e7790f21b0199a8930ea04e2e942
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc_mvs.c')
| -rw-r--r-- | libavcodec/hevc_mvs.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/hevc_mvs.c b/libavcodec/hevc_mvs.c index 6b3a8da143..d2a6169097 100644 --- a/libavcodec/hevc_mvs.c +++ b/libavcodec/hevc_mvs.c @@ -70,9 +70,9 @@ static int z_scan_block_avail(HEVCContext *s, int xCurr, int yCurr, yCurr >> s->sps->log2_min_tb_size); int N; - if ((xN < 0) || (yN < 0) || - (xN >= s->sps->width) || - (yN >= s->sps->height)) + if (xN < 0 || yN < 0 || + xN >= s->sps->width || + yN >= s->sps->height) return 0; N = MIN_TB_ADDR_ZS(xN >> s->sps->log2_min_tb_size, @@ -516,8 +516,8 @@ static void derive_spatial_merge_candidates(HEVCContext *s, int x0, int y0, mergecandlist[nb_merge_cand].mv[1].x = 0; mergecandlist[nb_merge_cand].mv[1].y = 0; mergecandlist[nb_merge_cand].is_intra = 0; - mergecandlist[nb_merge_cand].ref_idx[0] = (zero_idx < nb_refs) ? zero_idx : 0; - mergecandlist[nb_merge_cand].ref_idx[1] = (zero_idx < nb_refs) ? zero_idx : 0; + mergecandlist[nb_merge_cand].ref_idx[0] = zero_idx < nb_refs ? zero_idx : 0; + mergecandlist[nb_merge_cand].ref_idx[1] = zero_idx < nb_refs ? zero_idx : 0; nb_merge_cand++; zero_idx++; @@ -691,9 +691,8 @@ void ff_hevc_luma_mv_mvp_mode(HEVCContext *s, int x0, int y0, int nPbW, yA1_pu = yA1 >> s->sps->log2_min_pu_size; is_available_a1 = AVAILABLE(cand_left, A1); - if (is_available_a0 || is_available_a1) { + if (is_available_a0 || is_available_a1) isScaledFlag_L0 = 1; - } if (is_available_a0) { availableFlagLXA0 = MP_MX(A0, pred_flag_index_l0, mxA); |