From patchwork Thu May 31 00:05:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 9170 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp4929702jad; Wed, 30 May 2018 17:06:24 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLxwVmkOvTnxLXPXfIdbfO5z6QXWsMcgLl1PW5XokoE6ZhijrmLvO/OlgDRgilhM9VW78AK X-Received: by 2002:a1c:448:: with SMTP id 69-v6mr2976073wme.31.1527725184111; Wed, 30 May 2018 17:06:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527725184; cv=none; d=google.com; s=arc-20160816; b=aVtsS5F16j3FL54ucCpJG9nRlOlzyWiQE8h2I6/MKmKxbfYeVGJKQtVk4T9yZTMhRy dguUvWVgeOz6Wqb1pL2oUt6LoovcW8/xxNneejPShf+s0+zimo4F782yDO3sZZmPsY16 +LQ+vdh3wi34+XCDnqjWx/vbh0xTSoe08l8VNKqK2IWY1ZFoftUTE2uT1/VtZ9XqLCAN GRax0rex5jaT5nXnhfwivm0l4MtrK0VD+pWvjikgnly2z3H+rheSI9c64hW/q4Oj0aQQ DGwChEvJG3o7xpzlPR/NYGiW0h0u8kXguBJ0UJ3mv1RgY3Bxwkie2hXCOLprTePDQlm8 FT3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=v9VsID2cha30npk0U1gXp+XlV11Bpqtu2kc0FoSiImA=; b=UgKd2419F0ZEmfr1r80KK0+ENl4T2tofSo22lrSJa2FjfJQT1G03YZxiq2r4EOMWDV bx4TEmhrnDwhhAfRPVzClX+7Q/RyPIfPg3lnXP9gbZQmivVTMKvjxPYtRibB3spvDazC 9xFgkArOkA8OnMIN/U42eEdpeJgwDcxAaNX2HHamIdZ/9DP5/sc1UYgq+Xh8ySC9cDX5 hMIrc9f/Gml/goB2jL8tBxF4mK2kTLO1jVbmrEvAHGbQfTPdzReHF64Ac9XcY4Y4fblO rFIsPNIFt2QXpgJvmVwdTH8Tqt9RYspMWitLf3doGzKXanDjwG/k+n78rZOW7Jolk1Ye Dr3w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e70-v6si14601621wma.57.2018.05.30.17.06.23; Wed, 30 May 2018 17:06:24 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1AD09680057; Thu, 31 May 2018 03:05:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EA63168A421 for ; Thu, 31 May 2018 03:05:10 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B2741E06EA; Thu, 31 May 2018 02:05:55 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zoD8yPW6i7iI; Thu, 31 May 2018 02:05:54 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 67E93E1158; Thu, 31 May 2018 02:05:54 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Thu, 31 May 2018 02:05:35 +0200 Message-Id: <20180531000536.11482-5-cus@passwd.hu> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180531000536.11482-1-cus@passwd.hu> References: <20180531000536.11482-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/avcodec.h: add AV_CODEC_ID_TIMED_TEXT_MARKUP 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 Cc: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Marton Balint --- libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 8 ++++++++ libavcodec/version.h | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index fb0c6fae70..91ccef538e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -665,6 +665,7 @@ enum AVCodecID { AV_CODEC_ID_PJS, AV_CODEC_ID_ASS, AV_CODEC_ID_HDMV_TEXT_SUBTITLE, + AV_CODEC_ID_TIMED_TEXT_MARKUP, /* other specific kind of codecs (generally used for attachments) */ AV_CODEC_ID_FIRST_UNKNOWN = 0x18000, ///< A dummy ID pointing at the start of various fake codecs. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 79552a910d..9d38e63284 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3047,6 +3047,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("HDMV Text subtitle"), .props = AV_CODEC_PROP_TEXT_SUB, }, + { + .id = AV_CODEC_ID_TIMED_TEXT_MARKUP, + .type = AVMEDIA_TYPE_SUBTITLE, + .name = "ttml", + .long_name = NULL_IF_CONFIG_SMALL("Timed Text Markup Language"), + .props = AV_CODEC_PROP_TEXT_SUB, + }, + /* other kind of codecs and pseudo-codecs */ { diff --git a/libavcodec/version.h b/libavcodec/version.h index f65346a1ac..5a70093eaa 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MINOR 19 -#define LIBAVCODEC_VERSION_MICRO 104 +#define LIBAVCODEC_VERSION_MICRO 105 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \