virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-16 08:38:24 +02:00
Code Issues Releases Activity

rtsp: Allow $ as interleaved packet indicator before a complete response header

Browse Source 
Some RTSP servers ("HiIpcam/V100R003 VodServer/1.0.0") respond to
our keepalive GET_PARAMETER request by a truncated RTSP header
(lacking the final empty line to indicate a complete response
header). Prior to 764ec70149, this worked just fine since we
reacted to the $ as interleaved packet indicator anywhere.

Since $ is a valid character within the response header lines,
764ec70149 changed it to be ignored there. But to keep
compatibility with such broken servers, we need to at least
allow reacting to it at the start of lines.

Fixes ticket #4952.

Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit e02dcdf6bb)
This commit is contained in:
Martin Storsjö
2015-10-21 11:56:36 +03:00
committed by Carl Eugen Hoyos
parent 6616762134
commit 3f3e12c768
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavformat/rtsp.c
+1 -3
View File
@@ -1136,7 +1136,6 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
unsigned char ch; unsigned char ch;
const char *p; const char *p;
int ret, content_length, line_count = 0, request = 0; int ret, content_length, line_count = 0, request = 0;
int first_line = 1;
unsigned char *content = NULL; unsigned char *content = NULL;
start: start:
@@ -1156,7 +1155,7 @@ start:
return AVERROR_EOF; return AVERROR_EOF;
if (ch == '\n') if (ch == '\n')
break; break;
if (ch == '$' && first_line && q == buf) { if (ch == '$' && q == buf) {
if (return_on_interleaved_data) { if (return_on_interleaved_data) {
return 1; return 1;
} else } else
@@ -1167,7 +1166,6 @@ start:
} }
} }
*q = '\0'; *q = '\0';
first_line = 0;
av_log(s, AV_LOG_TRACE, "line='%s'\n", buf); av_log(s, AV_LOG_TRACE, "line='%s'\n", buf);