ffmpeg | branch: master | Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org> | Sat Feb 28 23:15:41 2015 +0100| [071f3e1c6e94b786b04b3496b0b82b4a5cf4e85f] | committer: Michael Niedermayer
Revert "rtsp: Interpret the text media type as AVMEDIA_TYPE_DATA" 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.chanteperd...@xenomai.org> Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=071f3e1c6e94b786b04b3496b0b82b4a5cf4e85f --- libavformat/rtsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 05f4171..91128e1 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
