libvpx: Pull from upstream

source/libvpx/vpx/vpx_image.h

 /*
  *  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.
  */
 
@@ skipping 10 matching lines @@
 #endif
 
   /*!\brief Current ABI version number
    *
    * \internal
    * If this file is altered in any way that changes the ABI, this value
    * must be bumped.  Examples include, but are not limited to, changing
    * types, removing or reassigning enums, adding/removing/rearranging
    * fields to structures
    */
-#define VPX_IMAGE_ABI_VERSION (1) /**<\hideinitializer*/
+#define VPX_IMAGE_ABI_VERSION (2) /**<\hideinitializer*/
 
 
 #define VPX_IMG_FMT_PLANAR     0x100  /**< Image is a planar format */
 #define VPX_IMG_FMT_UV_FLIP    0x200  /**< V plane precedes U plane in memory */
 #define VPX_IMG_FMT_HAS_ALPHA  0x400  /**< Image has an alpha channel component */
 
 
   /*!\brief List of supported image formats */
   typedef enum vpx_img_fmt {
     VPX_IMG_FMT_NONE,
@@ skipping 90 matching lines @@
     /* The following member may be set by the application to associate data
      * with this image.
      */
     void    *user_priv; /**< may be set by the application to associate data
                          *   with this image. */
 
     /* The following members should be treated as private. */
     unsigned char *img_data;       /**< private */
     int      img_data_owner; /**< private */
     int      self_allocd;    /**< private */
+
+    void    *fb_priv; /**< Frame buffer data associated with the image. */
   } vpx_image_t; /**< alias for struct vpx_image */
 
   /**\brief Representation of a rectangle on a surface */
   typedef struct vpx_image_rect {
     unsigned int x; /**< leftmost column */
     unsigned int y; /**< topmost row */
     unsigned int w; /**< width */
     unsigned int h; /**< height */
   } vpx_image_rect_t; /**< alias for struct vpx_image_rect */
 
@@ skipping 83 matching lines @@
    *
    * \param[in]    img       Image descriptor
    */
   void vpx_img_free(vpx_image_t *img);
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
 #endif  // VPX_VPX_IMAGE_H_