Merge "Use LIBSUBDIR for vpx.pc." into eider

[profile/ivi/libvpx.git] / y4minput.c

diff --git a/y4minput.c b/y4minput.c
index f1f50bc..dd51421 100644 (file)
--- a/y4minput.c
+++ b/y4minput.c
@@ -1,10 +1,11 @@
 /*
- *  Copyright (c) 2010 The VP8 project authors. All Rights Reserved.
+ *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
- *  Use of this source code is governed by a BSD-style license and patent
- *  grant that can be found in the LICENSE file in the root of the source
- *  tree. All contributing project authors may be found in the AUTHORS
- *  file in the root of the source tree.
+ *  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,
  *  Copyright (C) 2002-2010 The Xiph.Org Foundation and contributors.
@@ -145,7 +146,6 @@ static int y4m_parse_tags(y4m_input *_y4m,char *_tags){
    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++){
@@ -177,8 +177,6 @@ static void y4m_convert_42xmpeg2_42xjpeg(y4m_input *_y4m,unsigned char *_dst,
   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.*/
@@ -395,8 +393,6 @@ static void y4m_convert_422jpeg_420jpeg(y4m_input *_y4m,unsigned char *_dst,
   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;
@@ -460,12 +456,9 @@ static void y4m_convert_422_420jpeg(y4m_input *_y4m,unsigned char *_dst,
   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.*/
@@ -820,8 +813,6 @@ void y4m_input_close(y4m_input *_y4m){
 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;
@@ -876,5 +867,5 @@ int y4m_input_fetch_frame(y4m_input *_y4m,FILE *_fin,vpx_image_t *_img){
   _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 0;
+  return 1;
 }