Mercurial > mplayer.hg
changeset 30152:629b30951662
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
| author | diego |
|---|---|
| date | Mon, 04 Jan 2010 09:48:14 +0000 |
| parents | 631442f20e95 |
| children | 4e0755091f55 |
| files | stream/librtsp/rtsp.h stream/librtsp/rtsp_session.c stream/realrtsp/real.h |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/librtsp/rtsp.h Sun Jan 03 18:44:56 2010 +0000 +++ b/stream/librtsp/rtsp.h Mon Jan 04 09:48:14 2010 +0000 @@ -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
--- a/stream/librtsp/rtsp_session.c Sun Jan 03 18:44:56 2010 +0000 +++ b/stream/librtsp/rtsp_session.c Mon Jan 04 09:48:14 2010 +0000 @@ -175,7 +175,7 @@ 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");
--- a/stream/realrtsp/real.h Sun Jan 03 18:44:56 2010 +0000 +++ b/stream/realrtsp/real.h Mon Jan 04 09:48:14 2010 +0000 @@ -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 @@ int recv_read; /* header buffer */ - uint8_t header[HEADER_SIZE]; + uint8_t header[REAL_HEADER_SIZE]; int header_len; int header_read;