Merge commit '26524e358147aade6e9dd18fff42d61b966bbc70'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 20:34:38 +0000 (21:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Feb 2015 20:43:13 +0000 (21:43 +0100)
* commit '26524e358147aade6e9dd18fff42d61b966bbc70':
  rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA

See: afb0e5a810ae110a69b618e5fbed78a7c1b899f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtsp.c

index 6fd34cd..e7dc3dd 100644 (file)
@@ -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;