generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rtsp: Remove the separate filter_source variable

Browse Source 
Read it as a flag from the flags field instead.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2011-06-24 01:55:00 +03:00
parent eca4850c6d
commit 9867aea524
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/rtsp.c
View File

@@ -1235,7 +1235,7 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port,
case RTSP_LOWER_TRANSPORT_UDP: { case RTSP_LOWER_TRANSPORT_UDP: {
char url[1024], options[30] = ""; char url[1024], options[30] = "";
if (rt->filter_source) if (rt->rtsp_flags & RTSP_FLAG_FILTER_SRC)
av_strlcpy(options, "?connect=1", sizeof(options)); av_strlcpy(options, "?connect=1", sizeof(options));
/* Use source address if specified */ /* Use source address if specified */
if (reply->transports[0].source[0]) { if (reply->transports[0].source[0]) {
@@ -1333,8 +1333,6 @@ int ff_rtsp_connect(AVFormatContext *s)
} }
/* Only pass through valid flags from here */ /* Only pass through valid flags from here */
rt->lower_transport_mask &= (1 << RTSP_LOWER_TRANSPORT_NB) - 1; rt->lower_transport_mask &= (1 << RTSP_LOWER_TRANSPORT_NB) - 1;
if (rt->rtsp_flags & RTSP_FLAG_FILTER_SRC)
rt->filter_source = 1;
redirect: redirect:
lower_transport_mask = rt->lower_transport_mask; lower_transport_mask = rt->lower_transport_mask;
@@ -1373,7 +1371,7 @@ redirect:
lower_transport_mask |= (1<< RTSP_LOWER_TRANSPORT_TCP); lower_transport_mask |= (1<< RTSP_LOWER_TRANSPORT_TCP);
rt->control_transport = RTSP_MODE_TUNNEL; rt->control_transport = RTSP_MODE_TUNNEL;
} else if (!strcmp(option, "filter_src")) { } else if (!strcmp(option, "filter_src")) {
rt->filter_source = 1; rt->rtsp_flags |= RTSP_FLAG_FILTER_SRC;
} else { } else {
/* Write options back into the buffer, using memmove instead /* Write options back into the buffer, using memmove instead
* of strcpy since the strings may overlap. */ * of strcpy since the strings may overlap. */

4
libavformat/rtsp.h
View File

@@ -317,10 +317,6 @@ typedef struct RTSPState {
/** Reusable buffer for receiving packets */ /** Reusable buffer for receiving packets */
uint8_t* recvbuf; uint8_t* recvbuf;
/** Filter incoming UDP packets - receive packets only from the right
* source address and port. */
int filter_source;
/** /**
* A mask with all requested transport methods * A mask with all requested transport methods
*/ */