diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-06-10 10:54:29 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-06-10 10:55:10 -0700 |
| commit | b12a8dac98aa90d08d094d0a3709ef3eddf32092 (patch) | |
| tree | 367aee9c09877d646124415e62727991cc8c7ea5 /vp9/encoder | |
| parent | eedd98ac0a7aded03218acbc2391b8bc6c3e2b67 (diff) | |
| download | libvpx-b12a8dac98aa90d08d094d0a3709ef3eddf32092.tar libvpx-b12a8dac98aa90d08d094d0a3709ef3eddf32092.tar.gz libvpx-b12a8dac98aa90d08d094d0a3709ef3eddf32092.tar.bz2 libvpx-b12a8dac98aa90d08d094d0a3709ef3eddf32092.zip | |
Allow non-zeromv if ref_frame=intra with segmentation skip/ref enabled.
Change-Id: Ib5a95bb6ab643b276df3faa9bf99595e4a69ff18
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 06f571aaa..3d710dcf6 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2680,7 +2680,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, // If the segment skip feature is enabled.... // then do nothing if the current mode is not allowed.. } else if (vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP) && - (this_mode != ZEROMV)) { + (this_mode != ZEROMV && ref_frame != INTRA_FRAME)) { continue; // Disable this drop out case if the ref frame // segment level feature is enabled for this segment. This is to |