From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 24 Feb 2015 20:34:38 +0000 (+0100)
Subject: Merge commit '26524e358147aade6e9dd18fff42d61b966bbc70'
X-Git-Tag: n2.7-dev~246
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c6792275f43cdf1fc42f1cf4bd37c4595b048180?hp=c23a0e77dd492d6c794f89dbff3a438c95745e70

Merge commit '26524e358147aade6e9dd18fff42d61b966bbc70'

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

See: afb0e5a810ae110a69b618e5fbed78a7c1b899f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 6fd34cd..e7dc3dd 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;