]> git.sesse.net Git - ffmpeg/commitdiff
matroskaenc: make sure we don't produce invalid file with no codec ID
authorAurelien Jacobs <aurel@gnuage.org>
Thu, 24 Mar 2011 00:56:26 +0000 (01:56 +0100)
committerAnton Khirnov <anton@khirnov.net>
Thu, 12 May 2011 16:02:28 +0000 (18:02 +0200)
Signed-off-by: Aurelien Jacobs <aurel@gnuage.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavformat/matroskaenc.c

index 4aa4cafd4c9f16ee584eab4fef2e9fe0d82d72d9..1bbabc9ff4c777db1a01f6a38cbf871377d2d1c9 100644 (file)
@@ -614,6 +614,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(ENOSYS);
+                }
                 break;
             default:
                 av_log(s, AV_LOG_ERROR, "Only audio, video, and subtitles are supported for Matroska.\n");