generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix clang warning in rdopt

Browse Source 
either missed this or it crept back in

Change-Id: I6cc1519d09e558be7250254c25bde2ae720555ea
This commit is contained in:
Jim Bankoski 2013-09-12 06:39:42 -07:00
parent 7fb42d909e
commit 9ee9918dad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/encoder/vp9_rdopt.c
View File

@ -59,7 +59,7 @@ const MODE_DEFINITION vp9_mode_order[MAX_MODES] = {
{RD_DC_PRED, INTRA_FRAME, NONE},
{NEWMV, LAST_FRAME, NONE},
{RD_NEWMV, LAST_FRAME, NONE},
{RD_NEWMV, GOLDEN_FRAME, NONE},
{RD_NEARMV, LAST_FRAME, NONE},
@ -3434,11 +3434,11 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
if (vp9_mode_order[best_mode_index].ref_frame > INTRA_FRAME)
continue;
}
mbmi->mode = rd_mode_to_mode(this_mode);
if (cpi->sf.mode_search_skip_flags & FLAG_SKIP_INTRA_DIRMISMATCH) {
if (conditional_skipintra(this_mode, best_intra_mode))
if (conditional_skipintra(mbmi->mode, best_intra_mode))
continue;
}
mbmi->mode = rd_mode_to_mode(this_mode);
super_block_yrd(cpi, x, &rate_y, &distortion_y, &skippable, NULL,
bsize, tx_cache, best_rd);