diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 12:41:37 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-27 12:41:37 +0100 |
| commit | 12e95d156ae95e7db7f5a524112569b29cbdf0be (patch) | |
| tree | a200bbc66cd6ee082ff16292b87fd7d5bc4ef341 | |
| parent | 0bcb17d44e3c667af8d85aec2af41ae6a30308d5 (diff) | |
| parent | e02dcdf6bb6835ef4b49986b85a67efcb3495a7f (diff) | |
| download | ffmpeg-12e95d156ae95e7db7f5a524112569b29cbdf0be.tar.gz | |
Merge commit 'e02dcdf6bb6835ef4b49986b85a67efcb3495a7f'
* commit 'e02dcdf6bb6835ef4b49986b85a67efcb3495a7f':
rtsp: Allow $ as interleaved packet indicator before a complete response header
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavformat/rtsp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 00986435ae..e01dfd7b2d 100644 --- a/libavformat/rtsp.c +++ b/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); |