Merge "Adding ticks <-> timebase units conversion functions."
authorDmitry Kovalev <dkovalev@google.com>
Thu, 7 Aug 2014 17:18:08 +0000 (10:18 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 7 Aug 2014 17:18:08 +0000 (10:18 -0700)
1  2 
vp9/vp9_cx_iface.c

index f1e5534bcfd6f2404d233326e3d82a1a8aafd720,bb044f85797992a980ef4670b5b4d17e44a3042d..01eb15b7c55aa9c8d96de040cff446d2d43b8746
@@@ -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