From: James Zern <jzern@google.com>
Date: Tue, 16 Jul 2013 19:16:04 +0000 (-0700)
Subject: Merge "yv12config: remove YUV_TYPE"
X-Git-Tag: v1.3.0~852
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a7c2665d0162fd4b991f0942f0f4d31a2b98e5c;p=libvpx

Merge "yv12config: remove YUV_TYPE"
---

3a7c2665d0162fd4b991f0942f0f4d31a2b98e5c
diff --cc vpx_scale/yv12config.h
index a919e493b,127843c41..66e587af5
--- a/vpx_scale/yv12config.h
+++ b/vpx_scale/yv12config.h
@@@ -18,28 -18,9 +18,10 @@@ extern "C" 
  #include "vpx/vpx_integer.h"
  
  #define VP8BORDERINPIXELS       32
 -#define VP9BORDERINPIXELS       96
 +#define VP9INNERBORDERINPIXLES  96
 +#define VP9BORDERINPIXELS      160
  #define VP9_INTERP_EXTEND        4
  
-   /*************************************
-    For INT_YUV:
- 
-    Y = (R+G*2+B)/4;
-    U = (R-B)/2;
-    V =  (G*2 - R - B)/4;
-   And
-    R = Y+U-V;
-    G = Y+V;
-    B = Y-U-V;
-   ************************************/
-   typedef enum
-   {
-     REG_YUV = 0,    /* Regular yuv */
-     INT_YUV = 1     /* The type of yuv that can be tranfer to and from RGB through integer transform */
-   }
-             YUV_TYPE;
- 
    typedef struct yv12_buffer_config {
      int   y_width;
      int   y_height;