generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '764ec70149728be82304c163ccc4e280f1629201'

Browse Source 
* commit '764ec70149728be82304c163ccc4e280f1629201':
  rtsp: Only interpret $ as interleaved packet indicator at the start of replies

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-30 18:37:34 +02:00
commit bc4bdc6d61
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/rtsp.c
View File

@ -1136,6 +1136,7 @@ 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:
@ -1155,8 +1156,7 @@ start:
return AVERROR_EOF;
if (ch == '\n')
break;
if (ch == '$') {
/* XXX: only parse it if first char on line ? */
if (ch == '$' && first_line && q == buf) {
if (return_on_interleaved_data) {
return 1;
} else
@ -1167,6 +1167,7 @@ start:
}
}
*q = '\0';
first_line = 0;
av_log(s, AV_LOG_TRACE, "line='%s'\n", buf);