diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 21:34:38 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-24 21:43:13 +0100 |
commit | c6792275f43cdf1fc42f1cf4bd37c4595b048180 (patch) | |
tree | 3dc45f7370a2323b163d46f5c5c0ea98aca96bdb | |
parent | c23a0e77dd492d6c794f89dbff3a438c95745e70 (diff) | |
parent | 26524e358147aade6e9dd18fff42d61b966bbc70 (diff) | |
download | ffmpeg-c6792275f43cdf1fc42f1cf4bd37c4595b048180.tar.gz |
Merge commit '26524e358147aade6e9dd18fff42d61b966bbc70'
* commit '26524e358147aade6e9dd18fff42d61b966bbc70':
rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA
See: afb0e5a810ae110a69b618e5fbed78a7c1b899f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavformat/rtsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 6fd34cde73..e7dc3dd959 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -398,7 +398,7 @@ static void sdp_parse_line(AVFormatContext *s, SDPParseState *s1, codec_type = AVMEDIA_TYPE_AUDIO; } else if (!strcmp(st_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; } else if (!strcmp(st_type, "text")) { codec_type = AVMEDIA_TYPE_SUBTITLE; |