[MPlayer-cvslog] r30194 - in trunk/stream: librtsp/rtsp.h librtsp/rtsp_session.c realrtsp/real.h

[diego]

Author: diego
Date: Mon Jan  4 10:48:14 2010
New Revision: 30194

Log:
Disambiguate HEADER_SIZE definition in stream/librtsp and stream/realrtsp.
This fixes the warning:
In file included from stream/realrtsp/real.c:35:
stream/realrtsp/real.h:36:1: warning: "HEADER_SIZE" redefined

Modified:
   trunk/stream/librtsp/rtsp.h
   trunk/stream/librtsp/rtsp_session.c
   trunk/stream/realrtsp/real.h

Modified: trunk/stream/librtsp/rtsp.h
==============================================================================
--- trunk/stream/librtsp/rtsp.h	Sun Jan  3 19:44:56 2010	(r30193)
+++ trunk/stream/librtsp/rtsp.h	Mon Jan  4 10:48:14 2010	(r30194)
@@ -47,7 +47,7 @@
 #define RTSP_METHOD_SET_PARAMETER "SET_PARAMETER"
 
 #define BUF_SIZE 4096
-#define HEADER_SIZE 1024
+#define RTSP_HEADER_SIZE 1024
 #define MAX_FIELDS 256
 
 

Modified: trunk/stream/librtsp/rtsp_session.c
==============================================================================
--- trunk/stream/librtsp/rtsp_session.c	Sun Jan  3 19:44:56 2010	(r30193)
+++ trunk/stream/librtsp/rtsp_session.c	Mon Jan  4 10:48:14 2010	(r30194)
@@ -175,7 +175,7 @@ rtsp_session_t *rtsp_session_start(int f
       mp_msg(MSGT_OPEN, MSGL_V, "smil-over-realrtsp playlist, switching to raw rdt mode\n");
     } else {
     rtsp_session->real_session->header_len =
-      rmff_dump_header (h, (char *) rtsp_session->real_session->header, HEADER_SIZE);
+      rmff_dump_header (h, (char *) rtsp_session->real_session->header, RTSP_HEADER_SIZE);
 
       if (rtsp_session->real_session->header_len < 0) {
         mp_msg (MSGT_OPEN, MSGL_ERR,"rtsp_session: error while dumping RMFF headers, session can not be established.\n");

Modified: trunk/stream/realrtsp/real.h
==============================================================================
--- trunk/stream/realrtsp/real.h	Sun Jan  3 19:44:56 2010	(r30193)
+++ trunk/stream/realrtsp/real.h	Mon Jan  4 10:48:14 2010	(r30194)
@@ -33,7 +33,7 @@
 #include "rmff.h"
 #include "stream/librtsp/rtsp.h"
 
-#define HEADER_SIZE 4096
+#define REAL_HEADER_SIZE 4096
 
 struct real_rtsp_session_t {
   /* receive buffer */
@@ -42,7 +42,7 @@ struct real_rtsp_session_t {
   int recv_read;
 
   /* header buffer */
-  uint8_t header[HEADER_SIZE];
+  uint8_t header[REAL_HEADER_SIZE];
   int header_len;
   int header_read;