Drop log.h from rtmp.h

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@310 400ebc74-4327-4243-bc38-086b20814532

diff --git a/librtmp/log.h b/librtmp/log.h
index db8dbf314c52007d3197feaafdc52f5b7851988d..8c635b2ec61a5d01b1d33f82ae67554f32bc7394 100644 (file)
--- a/librtmp/log.h
+++ b/librtmp/log.h
@@ -30,7 +30,6 @@ extern "C" {
 #endif
 /* Enable this to get full debugging output */
 /* #define _DEBUG */
-#define CRYPTO
 
 #ifdef _DEBUG
 #undef NODEBUG

diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h
index 32e7d55dcf784139c9b312f38aaeeea2c61985cc..88ef291ee7c5ff9e8926ef6716f2257bdca0bccc 100644 (file)
--- a/librtmp/rtmp.h
+++ b/librtmp/rtmp.h
@@ -24,6 +24,8 @@
  *  http://www.gnu.org/copyleft/lgpl.html
  */
 
+#define CRYPTO
+
 #ifdef WIN32
 #include <winsock.h>
 #define GetSockError() WSAGetLastError()
@@ -51,7 +53,6 @@
 #include <errno.h>
 #include <stdint.h>
 
-#include "log.h"
 #include "amf.h"
 
 #ifdef __cplusplus

diff --git a/rtmpgw.c b/rtmpgw.c
index f7847f1157d897602953bc92d5b902d47f506e70..e8b16c7f58ac92110fb51d5829ea1f93db032f33 100644 (file)
--- a/rtmpgw.c
+++ b/rtmpgw.c
@@ -29,6 +29,7 @@
 #include <assert.h>
 
 #include "librtmp/rtmp.h"
+#include "librtmp/log.h"
 
 #include "thread.h"
 

diff --git a/rtmpsrv.c b/rtmpsrv.c
index a74a23bdd24235d6ae6201e90360d4ec95f693c6..565871ecb646f763a1bce0ecc79047a1b2711a83 100644 (file)
--- a/rtmpsrv.c
+++ b/rtmpsrv.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 
 #include "librtmp/rtmp.h"
-#include "parseurl.h"
+#include "librtmp/log.h"
 
 #include "thread.h"
 

diff --git a/rtmpsuck.c b/rtmpsuck.c
index 60f3c72f920bd7262901bf1b5d89f4c8bc5940d2..8cbc36cb9901d755bd5c53b83d15cf0b620b9f55 100644 (file)
--- a/rtmpsuck.c
+++ b/rtmpsuck.c
@@ -34,7 +34,7 @@
 #include <assert.h>
 
 #include "librtmp/rtmp.h"
-#include "parseurl.h"
+#include "librtmp/log.h"
 
 #include "thread.h"