Revert "rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA"
authorGilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Sat, 28 Feb 2015 22:15:41 +0000 (23:15 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Mar 2015 02:40:20 +0000 (03:40 +0100)
This reverts commit 26524e358147aade6e9dd18fff42d61b966bbc70.

If we want the T.140 codec to have the AV_CODEC_ID_TEXT codec id,
its type needs to be AVMEDIA_TYPE_SUBTITLE, so, keep interpreting
the text media type as AVMEDIA_TYPE_SUBTITLE.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtsp.c

index 05f4171..91128e1 100644 (file)
@@ -418,7 +418,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") || !strcmp(st_type, "text")) {
+        } else if (!strcmp(st_type, "application")) {
             codec_type = AVMEDIA_TYPE_DATA;
         } else if (!strcmp(st_type, "text")) {
             codec_type = AVMEDIA_TYPE_SUBTITLE;