libvpx: Pull from upstream

source/libvpx/vpx/vpx_encoder.h

Index: source/libvpx/vpx/vpx_encoder.h
===================================================================
--- source/libvpx/vpx/vpx_encoder.h	(revision 232227)
+++ source/libvpx/vpx/vpx_encoder.h	(working copy)
@@ -7,8 +7,9 @@
  *  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
@@ -28,8 +29,6 @@
 extern "C" {
 #endif
 
-#ifndef VPX_ENCODER_H
-#define VPX_ENCODER_H
 #include "vpx_codec.h"
 
   /*! Temporal Scalability: Maximum length of the sequence defining frame
@@ -930,8 +929,8 @@
 
 
   /*!@} - end defgroup encoder*/
-
-#endif
 #ifdef __cplusplus
 }
 #endif
+#endif
+