From patchwork Sat Apr 4 15:44:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jan Chren (rindeal)" X-Patchwork-Id: 18644 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id DFC2F449310 for ; Sat, 4 Apr 2020 18:52:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C3B5C68B149; Sat, 4 Apr 2020 18:52:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95E0C687F1D for ; Sat, 4 Apr 2020 18:52:27 +0300 (EEST) Received: by mail-oi1-f178.google.com with SMTP id w2so9047503oic.5 for ; Sat, 04 Apr 2020 08:52:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=xDV7sjV1gBA8Vs64hVyIMGrqFrE6ok7KxSr0AsIMPF4=; b=Pw1VjzshqhzMWBdF0sY5HLwf1zGaBMuoq2zoFWTGnVch1V1bRNLjQSC1KnWkskfMxD tGS0E/L/Q2/cW0h8P+R0HAYV9+Wom2/OTpquQ3IgVNp39SxZ7gGXdd6yCSoyHA8gQlsT O24PCHuDWUIU6Jo2I7/Ji68C+sCSXNDFMm0XHMMdLq+MGmWFBsoDb4U1gl4DeNRli9x9 Hxo98wcnNvcIwuCYfKmvHyPhkW5A/O02XjKZJH19P5tTkdoxUeuXfemxkr9DyiwhI6iY 9z1aBNTbnoBUYovgPgUlgRKcpruNDmZmQXgwe6FmiDR1RTlEu1TnKN/LDiyG+QTw69Ft arEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=xDV7sjV1gBA8Vs64hVyIMGrqFrE6ok7KxSr0AsIMPF4=; b=qejFZ4wP7uud/Cn2D5X4jLy2XPyQWputnPifLiUJvQCQE8Maqbg/9yP20Cnyd5N9SA mKlweTZQVdmD/3NbHlES8KzkTmkTMRJgaIjmwAm0Zu4rOt1FccLoAM0SxyEO8rE5M2FL hCl7ndHH0WzpBfShNZZoqi1KB+dAnx112qIdZfFam7knkZNjhlY7LjKN1yDZO/IstDfy oynS0s7c18qXli7LJXuFR8D4k4hVuwXx65gzPnizc+7F9WvWHufh56tsUa3d8pvguPvp 46fJQnxaMq6R+zgFBBzm5XeW8m8zn58XV3x5gGK0KjGPbNl+O8qvbjuAbyOENjRAg6Bw ddLw== X-Gm-Message-State: AGi0PuZknPW8sBe9o09d9zwhwOXrGY3WExwUI4q1PCCZcePz9XL2r6KP xSEQuamc9vH5KkQGU1n5o4HH8JKUUfHr9AfsCCV3yflw X-Google-Smtp-Source: APiQypLqLiEAFG8GFRIoTkf/WjrLTLsVz3DjKbh6/kP+eXUt3iyDn10HFrx6ZK0om2NFDf72nvTxYIizcJOZND4hf9c= X-Received: by 2002:a54:4519:: with SMTP id l25mr7161914oil.92.1586015122886; Sat, 04 Apr 2020 08:45:22 -0700 (PDT) MIME-Version: 1.0 From: "Jan Chren (rindeal)" Date: Sat, 4 Apr 2020 15:44:46 +0000 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: add matroska subtitle muxer (.mks) X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From eaa9f2685436725e19eb94e7f2d0174ba56b7429 Mon Sep 17 00:00:00 2001 From: Jan Chren (rindeal) Date: Thu, 1 Apr 2020 00:00:00 +0000 Subject: [PATCH] avformat/matroskaenc: add matroska subtitle muxer (.mks) Signed-off-by: Jan Chren (rindeal) --- libavformat/matroskaenc.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5dae53026d8..62127fe97f0 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2793,3 +2793,31 @@ AVOutputFormat ff_matroska_audio_muxer = { .priv_class = &mka_class, }; #endif + +#if CONFIG_MATROSKA_SUBTITLE_MUXER +static const AVClass mks_class = { + .class_name = "matroska subtitle muxer", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; +AVOutputFormat ff_matroska_subtitle_muxer = { + .name = "matroska", + .long_name = NULL_IF_CONFIG_SMALL("Matroska Subtitles"), + .extensions = "mks", + .priv_data_size = sizeof(MatroskaMuxContext), + .subtitle_codec = AV_CODEC_ID_ASS, + .init = mkv_init, + .deinit = mkv_deinit, + .write_header = mkv_write_header, + .write_packet = mkv_write_flush_packet, + .write_trailer = mkv_write_trailer, + .check_bitstream = mkv_check_bitstream, + .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | + AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, + .codec_tag = (const AVCodecTag* const []){ + additional_subtitle_tags, 0 + }, + .priv_class = &mks_class, +}; +#endif