mirror of
https://github.com/webmproject/libwebp.git
synced 2025-07-13 14:34:33 +02:00
fix merge problems
Change-Id: I6d0763734139d2852896872c80c5e7fa7889945a
This commit is contained in:
@ -11,10 +11,6 @@
|
||||
|
||||
#include "vp8i.h"
|
||||
|
||||
#if defined(__SSE2__)
|
||||
#include <emmintrin.h>
|
||||
#endif
|
||||
|
||||
#if defined(__cplusplus) || defined(c_plusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user