commit ea6bae3f7ccf68674bbba859b1f82639570447fd
author Mark Salyzyn <salyzyn@google.com> Mon Oct 10 21:52:12 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 10 21:52:12 2016 +0000
tree 697716e5257c46ca1bf30432cb6abe289910e9c6
parent 41504d26fe6b20d2a6a7b37bf6966139b8f7f7e1
parent 6f5dc6b03d036695e57f51bdd244a877b80ef90a

Merge "define LOG_TAG before including android/log.h" am: 35dcc67558
am: 6f5dc6b03d

Change-Id: I0611b42b0a5c211f5b0bc59d23d1dee2f4c7a7d9

otherlibs/highgui/cvcap_socket.cpp

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