summaryrefslogtreecommitdiff
path: root/vp8/encoder
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-08-03 16:12:12 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-08-03 16:13:15 -0400
commit238dae8604af11c484bdd8a9f5f17a07f29b4469 (patch)
tree504e2e2541011acf88be9c01462153de4c8cde92 /vp8/encoder
parent30e5deae5da1c8d6ad73a58d69f16c6d6330a6b9 (diff)
downloadlibvpx-238dae8604af11c484bdd8a9f5f17a07f29b4469.tar
libvpx-238dae8604af11c484bdd8a9f5f17a07f29b4469.tar.gz
libvpx-238dae8604af11c484bdd8a9f5f17a07f29b4469.tar.bz2
libvpx-238dae8604af11c484bdd8a9f5f17a07f29b4469.zip
Fix source buffer selection
This patch fixes a bug in the interaction between the recode loop and spatial resampling. If the codec was in a spatial resampling state, and a subsequent iteration of the recode loop disables resampling, then the source buffer must be reset to the unscaled source. Change-Id: I4e4cd47b943f6cd26a47449dc7f4255b38e27c77
Diffstat (limited to 'vp8/encoder')
-rw-r--r--vp8/encoder/onyx_if.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 833020374..36a186521 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -2594,6 +2594,8 @@ static void scale_and_extend_source(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi)
cpi->Source = &cpi->scaled_source;
#endif
}
+ else
+ cpi->Source = sd;
}