diff options
| author | Jerome Jiang <jianj@google.com> | 2017-11-13 21:04:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-11-13 21:04:41 +0000 |
| commit | 9df11a7c523bc4031572ef460e815487f4e74354 (patch) | |
| tree | ace1918159a5847a2c65d1569056bdc44b5785a5 /vp9 | |
| parent | a73cee2870d96f45960b546da931fe78e45a5407 (diff) | |
| parent | 0d2555bd2e1d44fd0f8e6406a7e0cca2cc47a575 (diff) | |
| download | libvpx-9df11a7c523bc4031572ef460e815487f4e74354.tar libvpx-9df11a7c523bc4031572ef460e815487f4e74354.tar.gz libvpx-9df11a7c523bc4031572ef460e815487f4e74354.tar.bz2 libvpx-9df11a7c523bc4031572ef460e815487f4e74354.zip | |
Merge "vp9 svc: Change conditions on VPX_ENCODER_ABI_VERSION."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/vp9_cx_iface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index fe17901be..00e69c04d 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -1288,7 +1288,7 @@ static vpx_codec_err_t encoder_encode(vpx_codec_alg_priv_t *ctx, cx_data += size; cx_data_sz -= size; -#if VPX_ENCODER_ABI_VERSION > (5 + VPX_CODEC_ABI_VERSION) +#if VPX_ENCODER_ABI_VERSION > (6 + VPX_CODEC_ABI_VERSION) #if CONFIG_SPATIAL_SVC if (cpi->use_svc && !ctx->output_cx_pkt_cb.output_cx_pkt) { vpx_codec_cx_pkt_t pkt_sizes, pkt_psnr; |