Index: source/libvpx/vp8/encoder/onyx_if.c |
diff --git a/source/libvpx/vp8/encoder/onyx_if.c b/source/libvpx/vp8/encoder/onyx_if.c |
index 41b30663a8d8ab9d76b60ad1dcefc7545e636921..53d9fbbde6d3df7f0b35df68721c89decfd19d62 100644 |
--- a/source/libvpx/vp8/encoder/onyx_if.c |
+++ b/source/libvpx/vp8/encoder/onyx_if.c |
@@ -11,6 +11,7 @@ |
#include "vpx_config.h" |
#include "./vpx_scale_rtcd.h" |
+#include "./vp8_rtcd.h" |
#include "vp8/common/onyxc_int.h" |
#include "vp8/common/blockd.h" |
#include "onyx_int.h" |
@@ -1760,8 +1761,16 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) |
reset_temporal_layer_change(cpi, oxcf, prev_number_of_layers); |
} |
+ if (!cpi->initial_width) |
+ { |
+ cpi->initial_width = cpi->oxcf.Width; |
+ cpi->initial_height = cpi->oxcf.Height; |
+ } |
+ |
cm->Width = cpi->oxcf.Width; |
cm->Height = cpi->oxcf.Height; |
+ assert(cm->Width <= cpi->initial_width); |
+ assert(cm->Height <= cpi->initial_height); |
/* TODO(jkoleszar): if an internal spatial resampling is active, |
* and we downsize the input image, maybe we should clear the |