Mercurial > mplayer.hg
comparison stream/librtsp/rtsp_session.c @ 29580:d3df5ca12917
Move variable declaration to where it is used.
author | reimar |
---|---|
date | Wed, 02 Sep 2009 10:28:08 +0000 |
parents | 0f1b5b68af32 |
children | c990a2cbfa8d |
comparison
equal
deleted
inserted
replaced
29579:26e0c6a16e57 | 29580:d3df5ca12917 |
---|---|
104 int port, int *redir, uint32_t bandwidth, char *user, char *pass) { | 104 int port, int *redir, uint32_t bandwidth, char *user, char *pass) { |
105 | 105 |
106 rtsp_session_t *rtsp_session = NULL; | 106 rtsp_session_t *rtsp_session = NULL; |
107 char *server; | 107 char *server; |
108 char *mrl_line = NULL; | 108 char *mrl_line = NULL; |
109 rmff_header_t *h; | |
110 | 109 |
111 rtsp_session = malloc (sizeof (rtsp_session_t)); | 110 rtsp_session = malloc (sizeof (rtsp_session_t)); |
112 rtsp_session->s = NULL; | 111 rtsp_session->s = NULL; |
113 rtsp_session->real_session = NULL; | 112 rtsp_session->real_session = NULL; |
114 rtsp_session->rtp_session = NULL; | 113 rtsp_session->rtp_session = NULL; |
136 } | 135 } |
137 if (strstr(server,RTSP_SERVER_TYPE_REAL) || strstr(server,RTSP_SERVER_TYPE_HELIX)) | 136 if (strstr(server,RTSP_SERVER_TYPE_REAL) || strstr(server,RTSP_SERVER_TYPE_HELIX)) |
138 { | 137 { |
139 /* we are talking to a real server ... */ | 138 /* we are talking to a real server ... */ |
140 | 139 |
141 h=real_setup_and_get_header(rtsp_session->s, bandwidth, user, pass); | 140 rmff_header_t *h=real_setup_and_get_header(rtsp_session->s, bandwidth, user, pass); |
142 if (!h) { | 141 if (!h) { |
143 /* got an redirect? */ | 142 /* got an redirect? */ |
144 if (rtsp_search_answers(rtsp_session->s, RTSP_OPTIONS_LOCATION)) | 143 if (rtsp_search_answers(rtsp_session->s, RTSP_OPTIONS_LOCATION)) |
145 { | 144 { |
146 free(mrl_line); | 145 free(mrl_line); |