Fix lint error in mjpeg and remove unnecessary includes.

BUG=none
TEST=try bots
Review URL: https://webrtc-codereview.appspot.com/1078005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@555 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

@@ -1,6 +1,6 @@
 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 554
+Version: 555
 License: BSD
 License File: LICENSE
 

include/libyuv/version.h

@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_  // NOLINT
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 554
+#define LIBYUV_VERSION 555
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_  NOLINT

source/convert_argb.cc

@@ -10,16 +10,14 @@
 
 #include "libyuv/convert_argb.h"
 
-#include <string.h>  // for memset()
-
 #include "libyuv/cpu_id.h"
 #include "libyuv/format_conversion.h"
 #ifdef HAVE_JPEG
 #include "libyuv/mjpeg_decoder.h"
 #endif
 #include "libyuv/rotate_argb.h"
-#include "libyuv/video_common.h"
 #include "libyuv/row.h"
+#include "libyuv/video_common.h"
 
 #ifdef __cplusplus
 namespace libyuv {

source/mjpeg_decoder.cc

@@ -9,24 +9,18 @@
  */
 
 #include "libyuv/mjpeg_decoder.h"
-#include "libyuv/planar_functions.h"  // For CopyPlane().
 
 #ifdef HAVE_JPEG
-// Must be included before jpeglib
 #include <assert.h>
 #ifndef __CLR_VER
+// Must be included before jpeglib.
 #include <setjmp.h>
 #define HAVE_SETJMP
 #endif
-#include <stdio.h>
-#include <stdlib.h>
-
-extern "C" {
+struct FILE;  // For jpeglib.h.
 #include <jpeglib.h>
-}
 
-#include <climits>
-#include <cstring>
+#include "libyuv/planar_functions.h"  // For CopyPlane().
 
 namespace libyuv {
 

source/row_common.cc

@@ -10,7 +10,7 @@
 
 #include "libyuv/row.h"
 
-#include <string.h>  // For memcpy
+#include <string.h>  // For memcpy and memset.
 
 #include "libyuv/basic_types.h"