diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:06:42 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:06:42 +0200 |
| commit | 17eb7f2c4bb070d9477792fcbd4a5120ee1a789c (patch) | |
| tree | 702cfe702169effb14fbabb3f50d289c1683147d /stream | |
| parent | ff3ef4e7827424db7444cdb7973faa499e054ac5 (diff) | |
| parent | eb6fc7e99e07712b74c17c917aa33704ef6e410a (diff) | |
| download | mpv-17eb7f2c4bb070d9477792fcbd4a5120ee1a789c.tar.bz2 mpv-17eb7f2c4bb070d9477792fcbd4a5120ee1a789c.tar.xz | |
Merge svn changes up to r30195
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/librtsp/rtsp.h | 2 | ||||
| -rw-r--r-- | stream/librtsp/rtsp_session.c | 2 | ||||
| -rw-r--r-- | stream/realrtsp/real.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/stream/librtsp/rtsp.h b/stream/librtsp/rtsp.h index 5252f8de22..f14a9a721c 100644 --- a/stream/librtsp/rtsp.h +++ b/stream/librtsp/rtsp.h @@ -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 diff --git a/stream/librtsp/rtsp_session.c b/stream/librtsp/rtsp_session.c index 33c36f15b9..b1176dbb99 100644 --- a/stream/librtsp/rtsp_session.c +++ b/stream/librtsp/rtsp_session.c @@ -175,7 +175,7 @@ rtsp_session_t *rtsp_session_start(int fd, char **mrl, char *path, char *host, 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"); diff --git a/stream/realrtsp/real.h b/stream/realrtsp/real.h index 40e59c7c23..6cc771b718 100644 --- a/stream/realrtsp/real.h +++ b/stream/realrtsp/real.h @@ -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; |