From 00dc0206cb5b351a66d7cce77b8a65fabe6ea7da Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Thu, 24 Mar 2011 01:56:26 +0100 Subject: [PATCH] matroskaenc: make sure we don't produce invalid file with no codec ID Signed-off-by: Aurelien Jacobs --- libavformat/matroskaenc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index c86206bc1b..df192a1cb3 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -630,6 +630,10 @@ static int mkv_write_tracks(AVFormatContext *s) case AVMEDIA_TYPE_SUBTITLE: put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_SUBTITLE); + if (!native_id) { + av_log(s, AV_LOG_ERROR, "Subtitle codec %d is not supported.\n", codec->codec_id); + return AVERROR_NOTSUPP; + } break; default: av_log(s, AV_LOG_ERROR, "Only audio, video, and subtitles are supported for Matroska.\n");