virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'e02dcdf6bb6835ef4b49986b85a67efcb3495a7f'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-27 12:41:37 +01:00
commit 12e95d156a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtsp.c
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);