From: Dmitry Kovalev <dkovalev@google.com>
Date: Thu, 7 Aug 2014 17:18:08 +0000 (-0700)
Subject: Merge "Adding ticks <-> timebase units conversion functions."
X-Git-Tag: v1.4.0~1077
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae249d8602fd553b91391dc112385b890bb89d2e;p=libvpx

Merge "Adding ticks <-> timebase units conversion functions."
---

ae249d8602fd553b91391dc112385b890bb89d2e
diff --cc vp9/vp9_cx_iface.c
index f1e5534bc,bb044f857..01eb15b7c
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@@ -905,12 -916,11 +916,11 @@@ static vpx_codec_err_t encoder_encode(v
                                           cx_data, &dst_time_stamp,
                                           &dst_end_time_stamp, !img)) {
        if (size) {
-         vpx_codec_pts_t round, delta;
-         vpx_codec_cx_pkt_t pkt;
          VP9_COMP *const cpi = (VP9_COMP *)ctx->cpi;
+         vpx_codec_cx_pkt_t pkt;
  
  #if CONFIG_SPATIAL_SVC
 -        if (cpi->use_svc && cpi->svc.number_temporal_layers == 1)
 +        if (is_spatial_svc(cpi))
            cpi->svc.layer_context[cpi->svc.spatial_layer_id].layer_size += size;
  #endif