libvpx: Pull from upstream

source/libvpx/vpx/vpx_encoder.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.
  */
-
+#ifndef VPX_ENCODER_H
+#define VPX_ENCODER_H
 
 /*!\defgroup encoder Encoder Algorithm Interface
  * \ingroup codec
  * This abstraction allows applications using this encoder to easily support
  * multiple video formats with minimal code duplication. This section describes
  * the interface common to all encoders.
  * @{
  */
 
 /*!\file
  * \brief Describes the encoder algorithm interface to applications.
  *
  * This file describes the interface between an application and a
  * video encoder algorithm.
  *
  */
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef VPX_ENCODER_H
-#define VPX_ENCODER_H
 #include "vpx_codec.h"
 
   /*! Temporal Scalability: Maximum length of the sequence defining frame
    * layer membership
    */
 #define VPX_TS_MAX_PERIODICITY 16
 
   /*! Temporal Scalability: Maximum number of coding layers */
 #define VPX_TS_MAX_LAYERS       5
 
@@ skipping 880 matching lines @@
    * \param[in]     ctx      Pointer to this instance's context
    *
    * \return Returns a pointer to a preview image, or NULL if no image is
    *         available.
    *
    */
   const vpx_image_t *vpx_codec_get_preview_frame(vpx_codec_ctx_t   *ctx);
 
 
   /*!@} - end defgroup encoder*/
-
-#endif
 #ifdef __cplusplus
 }
 #endif
+#endif
+