diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-08-27 10:03:57 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-08-27 10:03:57 -0700 |
| commit | 78e670fcf8bf8423d9abb99ba8e60027e45d1e62 (patch) | |
| tree | 46cb12a941e0ad1a512202d342950347a66c81e9 /vp9/encoder/vp9_rdopt.c | |
| parent | 45125ee5732898d95b5055649a469d3d2bbe8dd3 (diff) | |
| parent | 50ee61db4cfbd338d23d3c8368eef974840be08d (diff) | |
| download | libvpx-78e670fcf8bf8423d9abb99ba8e60027e45d1e62.tar libvpx-78e670fcf8bf8423d9abb99ba8e60027e45d1e62.tar.gz libvpx-78e670fcf8bf8423d9abb99ba8e60027e45d1e62.tar.bz2 libvpx-78e670fcf8bf8423d9abb99ba8e60027e45d1e62.zip | |
Merge "Renaming D27 to D207."
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index ee219572e..74282aafe 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -90,7 +90,7 @@ const MODE_DEFINITION vp9_mode_order[MAX_MODES] = { {H_PRED, INTRA_FRAME, NONE}, {V_PRED, INTRA_FRAME, NONE}, {D135_PRED, INTRA_FRAME, NONE}, - {D27_PRED, INTRA_FRAME, NONE}, + {D207_PRED, INTRA_FRAME, NONE}, {D153_PRED, INTRA_FRAME, NONE}, {D63_PRED, INTRA_FRAME, NONE}, {D117_PRED, INTRA_FRAME, NONE}, @@ -979,7 +979,7 @@ static int conditional_skipintra(MB_PREDICTION_MODE mode, best_intra_mode != V_PRED && best_intra_mode != D45_PRED) return 1; - if (mode == D27_PRED && + if (mode == D207_PRED && best_intra_mode != H_PRED && best_intra_mode != D45_PRED) return 1; |