Merge "define LOG_TAG before including android/log.h"
am: 35dcc67558
Change-Id: Iefdfd1ea0703742ea37d27783c698bc154d30216
diff --git a/otherlibs/highgui/cvcap_socket.cpp b/otherlibs/highgui/cvcap_socket.cpp
index 6e2f01e..96e4f0d 100644
--- a/otherlibs/highgui/cvcap_socket.cpp
+++ b/otherlibs/highgui/cvcap_socket.cpp
@@ -47,15 +47,15 @@
// capture video from a socket connection
//
+#define LOG_TAG "CVJNI"
+#define LOGV(...) __android_log_print(ANDROID_LOG_SILENT, LOG_TAG, __VA_ARGS__)
+
#include "_highgui.h"
#include <android/log.h>
#include <errno.h>
#include <netdb.h>
#include <unistd.h>
-#define LOGV(...) __android_log_print(ANDROID_LOG_SILENT, LOG_TAG, __VA_ARGS__)
-#define LOG_TAG "CVJNI"
-
#ifdef NDEBUG
#define CV_WARN(message)
#else