fix merge problems

Change-Id: I6d0763734139d2852896872c80c5e7fa7889945a

examples/cwebp.c

@@ -36,8 +36,7 @@
 
 #include "webp/encode.h"
 #include "stopwatch.h"
-
-extern void* VP8GetCPUInfo;
+extern void* VP8GetCPUInfo;   // opaque forward declaration.
 
 //-----------------------------------------------------------------------------
 

src/dec/dsp.c

@@ -11,10 +11,6 @@
 
 #include "vp8i.h"
 
-#if defined(__SSE2__)
-#include <emmintrin.h>
-#endif
-
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif

src/dec/vp8.c

@@ -327,7 +327,6 @@ int VP8GetHeaders(VP8Decoder* const dec, VP8Io* const io) {
     return VP8SetError(dec, VP8_STATUS_BITSTREAM_ERROR,
                        "cannot parse filter header");
   }
-
   status = ParsePartitions(dec, buf, buf_size);
   if (status != VP8_STATUS_OK) {
     return VP8SetError(dec, status, "cannot parse partitions");

src/webp/decode.h

@@ -178,10 +178,11 @@ VP8StatusCode WebPIAppend(WebPIDecoder* const idec, const uint8_t* data,
 VP8StatusCode WebPIUpdate(WebPIDecoder* const idec, const uint8_t* data,
                           uint32_t data_size);
 
-// Returns the RGB image decoded so far. Returns NULL if output params are not
-// initialized yet. *last_y is the index of last decoded row in raster scan
-// order. Some pointers (*last_y, *width etc.) can be NULL if corresponding
-// information is not needed.
+// Returns the r/g/b/(a) image decoded so far. Returns NULL if output params
+// are not initialized yet. The r/g/b/(a) output type corresponds to the mode
+// specified in WebPINew()/WebPINewRGB(). *last_y is the index of last decoded
+// row in raster scan order. Some pointers (*last_y, *width etc.) can be NULL if
+// corresponding information is not needed.
 uint8_t* WebPIDecGetRGB(const WebPIDecoder* const idec, int *last_y,
                         int* width, int* height, int* stride);