diff options
| author | Jingning Han <jingning@google.com> | 2014-07-25 15:56:31 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-07-25 15:56:31 -0700 |
| commit | 3d5f17311c05914a4b3358f65929445bc14926ac (patch) | |
| tree | f1b84c1828ec5ff982c113df2f80eb8fd18c7400 /vp9/encoder/vp9_rdopt.c | |
| parent | 8433c8f92df4e6e0e724624c44521de92639f251 (diff) | |
| parent | 7112d70f24719278c1f5e53d50636a1ce9bc552b (diff) | |
| download | libvpx-3d5f17311c05914a4b3358f65929445bc14926ac.tar libvpx-3d5f17311c05914a4b3358f65929445bc14926ac.tar.gz libvpx-3d5f17311c05914a4b3358f65929445bc14926ac.tar.bz2 libvpx-3d5f17311c05914a4b3358f65929445bc14926ac.zip | |
Merge "Remove unnecessary conditional assignment"
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 3c65a64ea..f65ac7b2b 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -3259,13 +3259,10 @@ int64_t vp9_rd_pick_inter_mode_sub8x8(VP9_COMP *cpi, MACROBLOCK *x, vp9_is_scaled(&cm->frame_refs[second_ref_frame - 1].sf)) continue; - if (comp_pred) { - mode_excluded = mode_excluded ? mode_excluded - : cm->reference_mode == SINGLE_REFERENCE; - } else if (ref_frame != INTRA_FRAME) { - mode_excluded = mode_excluded ? mode_excluded - : cm->reference_mode == COMPOUND_REFERENCE; - } + if (comp_pred) + mode_excluded = cm->reference_mode == SINGLE_REFERENCE; + else if (ref_frame != INTRA_FRAME) + mode_excluded = cm->reference_mode == COMPOUND_REFERENCE; // If the segment reference frame feature is enabled.... // then do nothing if the current ref frame is not allowed.. |