dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-07-13 14:34:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge problems

Browse Source 
Change-Id: I6d0763734139d2852896872c80c5e7fa7889945a
This commit is contained in:
Pascal Massimino
2011-04-26 11:02:38 -07:00
parent 8fd42b3a81
commit f7d9e261c5
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dec/dsp.c
View File

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

1
src/dec/vp8.c
View File

@ -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");