Originally committed as revision 21995 to svn://svn.ffmpeg.org/ffmpeg/trunk
Martin Storsjö authored on 2010/02/23 20:05:36... | ... |
@@ -251,7 +251,7 @@ static const AttrNameMap attr_names[]= |
251 | 251 |
* is broken out as a function because it is used in rtp_h264.c, which is |
252 | 252 |
* forthcoming. */ |
253 | 253 |
int ff_rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, |
254 |
- char *value, int value_size) |
|
254 |
+ char *value, int value_size) |
|
255 | 255 |
{ |
256 | 256 |
skip_spaces(p); |
257 | 257 |
if (**p) { |
... | ... |
@@ -280,7 +280,7 @@ static void sdp_parse_fmtp(AVStream *st, const char *p) |
280 | 280 |
|
281 | 281 |
/* loop on each attribute */ |
282 | 282 |
while (ff_rtsp_next_attr_and_value(&p, attr, sizeof(attr), |
283 |
- value, sizeof(value))) { |
|
283 |
+ value, sizeof(value))) { |
|
284 | 284 |
/* grab the codec extra_data from the config parameter of the fmtp |
285 | 285 |
* line */ |
286 | 286 |
sdp_parse_fmtp_config(codec, rtsp_st->dynamic_protocol_context, |
... | ... |
@@ -882,8 +882,8 @@ static void rtsp_skip_packet(AVFormatContext *s) |
882 | 882 |
} |
883 | 883 |
|
884 | 884 |
int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, |
885 |
- unsigned char **content_ptr, |
|
886 |
- int return_on_interleaved_data) |
|
885 |
+ unsigned char **content_ptr, |
|
886 |
+ int return_on_interleaved_data) |
|
887 | 887 |
{ |
888 | 888 |
RTSPState *rt = s->priv_data; |
889 | 889 |
char buf[4096], buf1[1024], *q; |
... | ... |
@@ -969,9 +969,9 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, |
969 | 969 |
} |
970 | 970 |
|
971 | 971 |
void ff_rtsp_send_cmd_with_content_async(AVFormatContext *s, |
972 |
- const char *cmd, |
|
973 |
- const unsigned char *send_content, |
|
974 |
- int send_content_length) |
|
972 |
+ const char *cmd, |
|
973 |
+ const unsigned char *send_content, |
|
974 |
+ int send_content_length) |
|
975 | 975 |
{ |
976 | 976 |
RTSPState *rt = s->priv_data; |
977 | 977 |
char buf[4096], buf1[1024]; |
... | ... |
@@ -1006,8 +1006,8 @@ void ff_rtsp_send_cmd_async(AVFormatContext *s, const char *cmd) |
1006 | 1006 |
} |
1007 | 1007 |
|
1008 | 1008 |
void ff_rtsp_send_cmd(AVFormatContext *s, |
1009 |
- const char *cmd, RTSPMessageHeader *reply, |
|
1010 |
- unsigned char **content_ptr) |
|
1009 |
+ const char *cmd, RTSPMessageHeader *reply, |
|
1010 |
+ unsigned char **content_ptr) |
|
1011 | 1011 |
{ |
1012 | 1012 |
ff_rtsp_send_cmd_async(s, cmd); |
1013 | 1013 |
|
... | ... |
@@ -333,9 +333,9 @@ extern int rtsp_rtp_port_max; |
333 | 333 |
* send_content is null |
334 | 334 |
*/ |
335 | 335 |
void ff_rtsp_send_cmd_with_content_async(AVFormatContext *s, |
336 |
- const char *cmd, |
|
337 |
- const unsigned char *send_content, |
|
338 |
- int send_content_length); |
|
336 |
+ const char *cmd, |
|
337 |
+ const unsigned char *send_content, |
|
338 |
+ int send_content_length); |
|
339 | 339 |
/** |
340 | 340 |
* Send a command to the RTSP server without waiting for the reply. |
341 | 341 |
* |
... | ... |
@@ -356,11 +356,11 @@ void ff_rtsp_send_cmd_async(AVFormatContext *s, const char *cmd); |
356 | 356 |
* send_content is null |
357 | 357 |
*/ |
358 | 358 |
void ff_rtsp_send_cmd_with_content(AVFormatContext *s, |
359 |
- const char *cmd, |
|
360 |
- RTSPMessageHeader *reply, |
|
361 |
- unsigned char **content_ptr, |
|
362 |
- const unsigned char *send_content, |
|
363 |
- int send_content_length); |
|
359 |
+ const char *cmd, |
|
360 |
+ RTSPMessageHeader *reply, |
|
361 |
+ unsigned char **content_ptr, |
|
362 |
+ const unsigned char *send_content, |
|
363 |
+ int send_content_length); |
|
364 | 364 |
|
365 | 365 |
/** |
366 | 366 |
* Send a command to the RTSP server and wait for the reply. |
... | ... |
@@ -368,7 +368,7 @@ void ff_rtsp_send_cmd_with_content(AVFormatContext *s, |
368 | 368 |
* @see rtsp_send_cmd_with_content |
369 | 369 |
*/ |
370 | 370 |
void ff_rtsp_send_cmd(AVFormatContext *s, const char *cmd, |
371 |
- RTSPMessageHeader *reply, unsigned char **content_ptr); |
|
371 |
+ RTSPMessageHeader *reply, unsigned char **content_ptr); |
|
372 | 372 |
|
373 | 373 |
/** |
374 | 374 |
* Read a RTSP message from the server, or prepare to read data |
... | ... |
@@ -392,8 +392,8 @@ void ff_rtsp_send_cmd(AVFormatContext *s, const char *cmd, |
392 | 392 |
* and 0 on success. |
393 | 393 |
*/ |
394 | 394 |
int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, |
395 |
- unsigned char **content_ptr, |
|
396 |
- int return_on_interleaved_data); |
|
395 |
+ unsigned char **content_ptr, |
|
396 |
+ int return_on_interleaved_data); |
|
397 | 397 |
|
398 | 398 |
/** |
399 | 399 |
* Connect to the RTSP server and set up the individual media streams. |