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

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