[FFmpeg-cvslog] matroskaenc: make sure we don't produce invalid file with no codec ID

Aurelien Jacobs git at videolan.org
Fri May 13 04:46:01 CEST 2011


ffmpeg | branch: master | Aurelien Jacobs <aurel at gnuage.org> | Thu Mar 24 01:56:26 2011 +0100| [89d4c130574c6f2a617c5fde6f9b8a82da7a1e28] | committer: Anton Khirnov

matroskaenc: make sure we don't produce invalid file with no codec ID

Signed-off-by: Aurelien Jacobs <aurel at gnuage.org>
Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=89d4c130574c6f2a617c5fde6f9b8a82da7a1e28
---

 libavformat/matroskaenc.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 4aa4caf..1bbabc9 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -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");



More information about the ffmpeg-cvslog mailing list