fix merge problems

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

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