From d6a93490629007a789d8b7f956caeb978cebb7c4 Mon Sep 17 00:00:00 2001 From: Jai Menon Date: Fri, 25 Jun 2010 04:29:02 +0000 Subject: avienc : Avoid creating invalid AVI files when muxing subtitle streams other than XSUB. Originally committed as revision 23766 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/avienc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavformat/avienc.c') diff --git a/libavformat/avienc.c b/libavformat/avienc.c index b4a31ec54a..161fb1bfc7 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -225,7 +225,10 @@ static int avi_write_header(AVFormatContext *s) case AVMEDIA_TYPE_SUBTITLE: // XSUB subtitles behave like video tracks, other subtitles // are not (yet) supported. - if (stream->codec_id != CODEC_ID_XSUB) break; + if (stream->codec_id != CODEC_ID_XSUB) { + av_log(s, AV_LOG_ERROR, "Subtitle streams other than DivX XSUB are not supported by the AVI muxer.\n"); + return AVERROR_PATCHWELCOME; + } case AVMEDIA_TYPE_VIDEO: put_tag(pb, "vids"); break; case AVMEDIA_TYPE_AUDIO: put_tag(pb, "auds"); break; // case AVMEDIA_TYPE_TEXT : put_tag(pb, "txts"); break; -- cgit v1.2.3