Mercurial > mplayer.hg

comparison stream/librtsp/rtsp_session.c @ 30152:629b30951662

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 dc57d7bd98e1
children 8fa2f43cb760
comparison
equal deleted inserted replaced
30151:631442f20e95 30152:629b30951662
173 rtsp_session->real_session->recv_size = 0; 173 rtsp_session->real_session->recv_size = 0;
174 rtsp_session->real_session->rdt_rawdata = 1; 174 rtsp_session->real_session->rdt_rawdata = 1;
175 mp_msg(MSGT_OPEN, MSGL_V, "smil-over-realrtsp playlist, switching to raw rdt mode\n"); 175 mp_msg(MSGT_OPEN, MSGL_V, "smil-over-realrtsp playlist, switching to raw rdt mode\n");
176 } else { 176 } else {
177 rtsp_session->real_session->header_len = 177 rtsp_session->real_session->header_len =
178 rmff_dump_header (h, (char *) rtsp_session->real_session->header, HEADER_SIZE); 178 rmff_dump_header (h, (char *) rtsp_session->real_session->header, RTSP_HEADER_SIZE);
179 179
180 if (rtsp_session->real_session->header_len < 0) { 180 if (rtsp_session->real_session->header_len < 0) {
181 mp_msg (MSGT_OPEN, MSGL_ERR,"rtsp_session: error while dumping RMFF headers, session can not be established.\n"); 181 mp_msg (MSGT_OPEN, MSGL_ERR,"rtsp_session: error while dumping RMFF headers, session can not be established.\n");
182 free_real_rtsp_session(rtsp_session->real_session); 182 free_real_rtsp_session(rtsp_session->real_session);
183 rtsp_close(rtsp_session->s); 183 rtsp_close(rtsp_session->s);