diff options
| author | Jerome Jiang <jianj@google.com> | 2017-02-22 04:44:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-02-22 04:44:55 +0000 |
| commit | b1dcaf7f1e17af1697dd842521cb1fecf330f221 (patch) | |
| tree | 1b4d8f037c1e9aae23e2ab0372ca6d4da98c768e /vp9/encoder/vp9_encoder.c | |
| parent | 7f2daa74a05beee77003ef4288eafb3e3db9a531 (diff) | |
| parent | 0d1e5a21c4a89bc875e8600c753348963ef7e78a (diff) | |
| download | libvpx-b1dcaf7f1e17af1697dd842521cb1fecf330f221.tar libvpx-b1dcaf7f1e17af1697dd842521cb1fecf330f221.tar.gz libvpx-b1dcaf7f1e17af1697dd842521cb1fecf330f221.tar.bz2 libvpx-b1dcaf7f1e17af1697dd842521cb1fecf330f221.zip | |
Merge "Fix segmentation fault caused by denoiser working with spatial SVC."
Diffstat (limited to 'vp9/encoder/vp9_encoder.c')
| -rw-r--r-- | vp9/encoder/vp9_encoder.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_encoder.c b/vp9/encoder/vp9_encoder.c index e07d2af2d..d624d04fd 100644 --- a/vp9/encoder/vp9_encoder.c +++ b/vp9/encoder/vp9_encoder.c @@ -3000,8 +3000,9 @@ static void set_size_dependent_vars(VP9_COMP *cpi, int *q, int *bottom_index, case 6: l = 150; break; } if (!cpi->common.postproc_state.limits) { - cpi->common.postproc_state.limits = vpx_calloc( - cpi->common.width, sizeof(*cpi->common.postproc_state.limits)); + cpi->common.postproc_state.limits = + vpx_calloc(cpi->un_scaled_source->y_width, + sizeof(*cpi->common.postproc_state.limits)); } vp9_denoise(cpi->Source, cpi->Source, l, cpi->common.postproc_state.limits); } |