Update libvpx snapshot to v0.9.7-p1 (Cayuga).

source/libvpx/y4minput.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  *  Based on code from the OggTheora software codec source code,
@@ skipping 128 matching lines @@
   |       |       |       |
   |       |       |       |
 
   We use a resampling filter to shift the site locations one quarter pixel (at
    the chroma plane's resolution) to the right.
   The 4:2:2 modes look exactly the same, except there are twice as many chroma
    lines, and they are vertically co-sited with the luma samples in both the
    mpeg2 and jpeg cases (thus requiring no vertical resampling).*/
 static void y4m_42xmpeg2_42xjpeg_helper(unsigned char *_dst,
  const unsigned char *_src,int _c_w,int _c_h){
-  int pli;
   int y;
   int x;
   for(y=0;y<_c_h;y++){
     /*Filter: [4 -17 114 35 -9 1]/128, derived from a 6-tap Lanczos
        window.*/
     for(x=0;x<OC_MINI(_c_w,2);x++){
       _dst[x]=(unsigned char)OC_CLAMPI(0,(4*_src[0]-17*_src[OC_MAXI(x-1,0)]+
        114*_src[x]+35*_src[OC_MINI(x+1,_c_w-1)]-9*_src[OC_MINI(x+2,_c_w-1)]+
        _src[OC_MINI(x+3,_c_w-1)]+64)>>7,255);
     }
@@ skipping 11 matching lines @@
   }
 }
 
 /*Handles both 422 and 420mpeg2 to 422jpeg and 420jpeg, respectively.*/
 static void y4m_convert_42xmpeg2_42xjpeg(y4m_input *_y4m,unsigned char *_dst,
  unsigned char *_aux){
   int c_w;
   int c_h;
   int c_sz;
   int pli;
-  int y;
-  int x;
   /*Skip past the luma data.*/
   _dst+=_y4m->pic_w*_y4m->pic_h;
   /*Compute the size of each chroma plane.*/
   c_w=(_y4m->pic_w+_y4m->dst_c_dec_h-1)/_y4m->dst_c_dec_h;
   c_h=(_y4m->pic_h+_y4m->dst_c_dec_v-1)/_y4m->dst_c_dec_v;
   c_sz=c_w*c_h;
   for(pli=1;pli<3;pli++){
     y4m_42xmpeg2_42xjpeg_helper(_dst,_aux,c_w,c_h);
     _dst+=c_sz;
     _aux+=c_sz;
@@ skipping 196 matching lines @@
   We use a resampling filter to decimate the chroma planes by two in the
    vertical direction.*/
 static void y4m_convert_422jpeg_420jpeg(y4m_input *_y4m,unsigned char *_dst,
  unsigned char *_aux){
   int c_w;
   int c_h;
   int c_sz;
   int dst_c_w;
   int dst_c_h;
   int dst_c_sz;
-  int tmp_sz;
-  int pic_sz;
   int pli;
   /*Skip past the luma data.*/
   _dst+=_y4m->pic_w*_y4m->pic_h;
   /*Compute the size of each chroma plane.*/
   c_w=(_y4m->pic_w+_y4m->src_c_dec_h-1)/_y4m->src_c_dec_h;
   c_h=_y4m->pic_h;
   dst_c_w=(_y4m->pic_w+_y4m->dst_c_dec_h-1)/_y4m->dst_c_dec_h;
   dst_c_h=(_y4m->pic_h+_y4m->dst_c_dec_v-1)/_y4m->dst_c_dec_v;
   c_sz=c_w*c_h;
   dst_c_sz=dst_c_w*dst_c_h;
@@ skipping 43 matching lines @@
   We use a resampling filter to shift the original site locations one quarter
    pixel (at the original chroma resolution) to the right.
   Then we use a second resampling filter to decimate the chroma planes by two
    in the vertical direction.*/
 static void y4m_convert_422_420jpeg(y4m_input *_y4m,unsigned char *_dst,
  unsigned char *_aux){
   unsigned char *tmp;
   int            c_w;
   int            c_h;
   int            c_sz;
-  int            dst_c_w;
   int            dst_c_h;
   int            dst_c_sz;
   int            pli;
-  int            y;
-  int            x;
   /*Skip past the luma data.*/
   _dst+=_y4m->pic_w*_y4m->pic_h;
   /*Compute the size of each chroma plane.*/
   c_w=(_y4m->pic_w+_y4m->src_c_dec_h-1)/_y4m->src_c_dec_h;
   c_h=_y4m->pic_h;
   dst_c_h=(_y4m->pic_h+_y4m->dst_c_dec_v-1)/_y4m->dst_c_dec_v;
   c_sz=c_w*c_h;
   dst_c_sz=c_w*dst_c_h;
   tmp=_aux+2*c_sz;
   for(pli=1;pli<3;pli++){
@@ skipping 334 matching lines @@
 }
 
 void y4m_input_close(y4m_input *_y4m){
   free(_y4m->dst_buf);
   free(_y4m->aux_buf);
 }
 
 int y4m_input_fetch_frame(y4m_input *_y4m,FILE *_fin,vpx_image_t *_img){
   char frame[6];
   int  pic_sz;
-  int  frame_c_w;
-  int  frame_c_h;
   int  c_w;
   int  c_h;
   int  c_sz;
   int  ret;
   /*Read and skip the frame header.*/
   ret=fread(frame,1,6,_fin);
   if(ret<6)return 0;
   if(memcmp(frame,"FRAME",5)){
     fprintf(stderr,"Loss of framing in Y4M input data\n");
     return -1;
@@ skipping 36 matching lines @@
   c_w=(_y4m->pic_w+_y4m->dst_c_dec_h-1)/_y4m->dst_c_dec_h;
   c_h=(_y4m->pic_h+_y4m->dst_c_dec_v-1)/_y4m->dst_c_dec_v;
   c_sz=c_w*c_h;
   _img->stride[PLANE_Y]=_y4m->pic_w;
   _img->stride[PLANE_U]=_img->stride[PLANE_V]=c_w;
   _img->planes[PLANE_Y]=_y4m->dst_buf;
   _img->planes[PLANE_U]=_y4m->dst_buf+pic_sz;
   _img->planes[PLANE_V]=_y4m->dst_buf+pic_sz+c_sz;
   return 1;
 }