[SCM] libav/experimental: avienc : Avoid creating invalid AVI files when muxing subtitle streams other than XSUB.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:09:14 UTC 2013
The following commit has been merged in the experimental branch:
commit d6a93490629007a789d8b7f956caeb978cebb7c4
Author: Jai Menon <jmenon86 at gmail.com>
Date: Fri Jun 25 04:29:02 2010 +0000
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
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index b4a31ec..161fb1b 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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list