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

fix build issues for experimental branch

Browse Source 
experimental branch build was broken from some merge artifacts, this
commit fixes those issues to enable the experimental branch to build.

Change-Id: Ic52b2d2f1d1b80abb7ecaa4c0927bcf887ac0c2a
This commit is contained in:
Yaowu Xu 2011-06-22 15:07:04 -07:00
parent 786246ebf1
commit 7793b386a7
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -301,7 +301,6 @@ CMDLINE_SELECT="
shared shared
small small
postproc_visualizer postproc_visualizer
experimental experimental
" "
@ -319,9 +318,11 @@ process_cmdline() {
log_echo "Ignoring $opt -- not in experimental mode." log_echo "Ignoring $opt -- not in experimental mode."
fi fi
else else
process_common_cmdline "$opt" process_common_cmdline $opt
fi fi
;; ;;
*) process_common_cmdline $opt
;;
esac esac
done done
} }

10
vp8/encoder/rdopt.c
View File

@ -630,7 +630,12 @@ static void macro_block_yrd( MACROBLOCK *mb,
// Distortion // Distortion
d = ENCODEMB_INVOKE(rtcd, mberr)(mb, 1) << 2; d = ENCODEMB_INVOKE(rtcd, mberr)(mb, 1) << 2;
#if CONFIG_EXTEND_QRANGE
d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff)<<2;
#else
d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff); d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff);
#endif
*Distortion = (d >> 4); *Distortion = (d >> 4);
@ -1049,10 +1054,7 @@ static unsigned int vp8_encode_inter_mb_segment(MACROBLOCK *x, int const *labels
return distortion; return distortion;
} }
#if CONFIG_EXTEND_QRANGE
d += ENCODEMB_INVOKE(rtcd, berr)(mb_y2->coeff, x_y2->dqcoeff)<<2;
#else
#endif
static const unsigned int segmentation_to_sseshift[4] = {3, 3, 2, 0}; static const unsigned int segmentation_to_sseshift[4] = {3, 3, 2, 0};