diff options
| author | Hui Su <huisu@google.com> | 2018-09-28 16:06:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-28 16:06:00 +0000 |
| commit | 308454502c665aaff9366206ce798bd4940772d0 (patch) | |
| tree | 63722dddcebf1712fd8961a975b96de4227119ee /vp9 | |
| parent | 89c4ba1c77869eff129b4663b38a0e959572dc74 (diff) | |
| parent | 2176d88fc343c8ffa6f29fafc3cffb5ec043f1d2 (diff) | |
| download | libvpx-308454502c665aaff9366206ce798bd4940772d0.tar libvpx-308454502c665aaff9366206ce798bd4940772d0.tar.gz libvpx-308454502c665aaff9366206ce798bd4940772d0.tar.bz2 libvpx-308454502c665aaff9366206ce798bd4940772d0.zip | |
Merge "Fix a loophole in nonrd_pick_partition()"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index f1527f930..811674d84 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -4404,6 +4404,8 @@ static void nonrd_pick_partition(VP9_COMP *cpi, ThreadData *td, partition_vert_allowed &= force_vert_split; } + if (!partition_none_allowed && !do_split) do_rect = 1; + ctx->pred_pixel_ready = !(partition_vert_allowed || partition_horz_allowed || do_split); |