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 --cc libavformat/rtsp.c
index 6fd34cd,20e380a..e7dc3dd
--- 1/libavformat/rtsp.c
--- 2/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@@ -398,10 -393,8 +398,10 @@@ static void sdp_parse_line(AVFormatCont
              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;
          }
          if (codec_type == AVMEDIA_TYPE_UNKNOWN || !(rt->media_type_mask & (1 << codec_type))) {
              s1->skip_media = 1;