diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-02-09 16:10:46 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-02-09 16:10:46 +0000 |
| commit | cf8af867dddc7830cf42577dd9bb27bf0330a682 (patch) | |
| tree | a9fd276314ad7e7705bfbc7466836da030e35a84 /vp8/encoder/pickinter.c | |
| parent | 8266abfe96cb1b46f537aec66b3dfcf22da2bb1c (diff) | |
| download | libvpx-cf8af867dddc7830cf42577dd9bb27bf0330a682.tar libvpx-cf8af867dddc7830cf42577dd9bb27bf0330a682.tar.gz libvpx-cf8af867dddc7830cf42577dd9bb27bf0330a682.tar.bz2 libvpx-cf8af867dddc7830cf42577dd9bb27bf0330a682.zip | |
Merge COMPRED
Merged in most of the current common prediction changes
that were under the #if CONFIG_COMPRED option.
Change-Id: If4e6f61dbe7b86dd449f6effbe93b5eb7e893885
Diffstat (limited to 'vp8/encoder/pickinter.c')
| -rw-r--r-- | vp8/encoder/pickinter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 239780641..8b78986e2 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -601,7 +601,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, // #if CONFIG_COMPRED -// TODO... this will all need changing for new reference frame coding model +// TODO... this will need changing for new reference frame coding model // #endif // Work out the cost assosciated with selecting the reference frame frame_cost = |