From f7d9e261c56ff9080a9f40b3c81ecd2fe0383546 Mon Sep 17 00:00:00 2001
From: Pascal Massimino <pascal.massimino@gmail.com>
Date: Tue, 26 Apr 2011 11:02:38 -0700
Subject: [PATCH] fix merge problems

Change-Id: I6d0763734139d2852896872c80c5e7fa7889945a
---
 examples/cwebp.c  | 3 +--
 src/dec/dsp.c     | 4 ----
 src/dec/vp8.c     | 1 -
 src/webp/decode.h | 9 +++++----
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/examples/cwebp.c b/examples/cwebp.c
index 38cccdf3..9ad5e7b0 100644
--- a/examples/cwebp.c
+++ b/examples/cwebp.c
@@ -36,8 +36,7 @@
 
 #include "webp/encode.h"
 #include "stopwatch.h"
-
-extern void* VP8GetCPUInfo;
+extern void* VP8GetCPUInfo;   // opaque forward declaration.
 
 //-----------------------------------------------------------------------------
 
diff --git a/src/dec/dsp.c b/src/dec/dsp.c
index efde49d9..f28705c6 100644
--- a/src/dec/dsp.c
+++ b/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
diff --git a/src/dec/vp8.c b/src/dec/vp8.c
index ed706126..1432a869 100644
--- a/src/dec/vp8.c
+++ b/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");
diff --git a/src/webp/decode.h b/src/webp/decode.h
index 6c63d54b..60047e37 100644
--- a/src/webp/decode.h
+++ b/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);