rtsp: Remove the separate filter_source variable

Read it as a flag from the flags field instead.

Signed-off-by: Martin Storsjö <martin@martin.st>

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

diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index a03ad9d2feeed6ec0cda1755a8a48e325dd6a09f..7143acbe4fc3c71e0c263eb1a80b6408e9382684 100644 (file)
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.h
@@ -317,10 +317,6 @@ typedef struct RTSPState {
     /** Reusable buffer for receiving packets */
     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
      */