har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '26524e358147aade6e9dd18fff42d61b966bbc70'

Browse Source 
* commit '26524e358147aade6e9dd18fff42d61b966bbc70':
  rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA

See: afb0e5a810ae110a69b618e5fbed78a7c1b899f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-24 21:34:38 +01:00
commit c6792275f4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/rtsp.c
View File

@ -398,7 +398,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1,
codec_type = AVMEDIA_TYPE_AUDIO; codec_type = AVMEDIA_TYPE_AUDIO;
} else if (!strcmp(st_type, "video")) { } else if (!strcmp(st_type, "video")) {
codec_type = AVMEDIA_TYPE_VIDEO; codec_type = AVMEDIA_TYPE_VIDEO;
} else if (!strcmp(st_type, "application")) { } else if (!strcmp(st_type, "application") || !strcmp(st_type, "text")) {
codec_type = AVMEDIA_TYPE_DATA; codec_type = AVMEDIA_TYPE_DATA;
} else if (!strcmp(st_type, "text")) { } else if (!strcmp(st_type, "text")) {
codec_type = AVMEDIA_TYPE_SUBTITLE; codec_type = AVMEDIA_TYPE_SUBTITLE;