mirror of
https://github.com/mpv-player/mpv
synced 2024-12-23 23:32:26 +00:00
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 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30194 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
fb26608318
commit
348a61a71f
@ -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
|
||||
|
||||
|
||||
|
@ -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");
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user