Merge "yv12config: remove YUV_TYPE"

diff --cc vp9/common/vp9_alloccommon.c
Simple merge

diff --cc vp9/common/vp9_onyxc_int.h
Simple merge

diff --cc vp9/decoder/vp9_onyxd_if.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge

diff --cc vpx_scale/yv12config.h
index a919e493b901ab33865f0afe8e98efd70913adab,127843c414907626fbe800ebe0b37060d2c5bd1f..66e587af521bff55d0148efca8e4761cda2a9a2d
--- 1/vpx_scale/yv12config.h
--- 2/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;