Merge commit 'e02dcdf6bb6835ef4b49986b85a67efcb3495a7f'

* commit 'e02dcdf6bb6835ef4b49986b85a67efcb3495a7f':
  rtsp: Allow $ as interleaved packet indicator before a complete response header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

libavformat/rtsp.c

@@ -1136,7 +1136,6 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
     unsigned char ch;
     const char *p;
     int ret, content_length, line_count = 0, request = 0;
-    int first_line = 1;
     unsigned char *content = NULL;
 
 start:
@@ -1156,7 +1155,7 @@ start:
                 return AVERROR_EOF;
             if (ch == '\n')
                 break;
-            if (ch == '$' && first_line && q == buf) {
+            if (ch == '$' && q == buf) {
                 if (return_on_interleaved_data) {
                     return 1;
                 } else
@@ -1167,7 +1166,6 @@ start:
             }
         }
         *q = '\0';
-        first_line = 0;
 
         av_log(s, AV_LOG_TRACE, "line='%s'\n", buf);