From patchwork Sat Jan 25 02:01:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 17531 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 EEF5044BC55 for ; Sat, 25 Jan 2020 04:02:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D79E568B149; Sat, 25 Jan 2020 04:02:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f51.google.com (mail-yw1-f51.google.com [209.85.161.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD59368B0EE for ; Sat, 25 Jan 2020 04:02:39 +0200 (EET) Received: by mail-yw1-f51.google.com with SMTP id u139so1828056ywf.13 for ; Fri, 24 Jan 2020 18:02:39 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+UZIap9mHVVXsufbKojgnEVAtVVyONfpBtw0OGe0Elg=; b=ui476R/ikzWlzBXxsi9emo4uExhtodZ1Vv0s9ipLswJ9jEaaSNh77vJQPPyOegVb+X 7MP4uExY1KwiT3xjnSgimEUL/emZqT7sT7sJgYThosG4G472PzG7OeixjHtGamO56NQn JgG3mh+d1Nd6dTWPqOZWokIorvtGmDsKYq9IEThkaHgfaizTbKB3ZSXUzn9peNrQYaYE I74ZkhBwNkN5LZ8CYeeOv9tkZwV3GX4/Qvq0+mTq1aQMtENUoByGUjuCr0p/Kn2xAehm bIl4mCY4Gpj9AMJfArTAhRSknzhEeRLccj894tCSw5brPRYoyIrw7kExIxsoKT5tQjU9 /Fbg== X-Gm-Message-State: APjAAAV3XAtBqSu7ytjcVudsl987Abe1yCe06NToY/TPtfIQV9q7/x3l 11Ex1tw1PaWtqGIntRjebjAeWgIko9Q= X-Google-Smtp-Source: APXvYqws6MT7p2BhIDW1dwjPW/F/AfsmAEjyDaZKsAvZU3hnEdChE8zHAgNQKQLcQwmLvO/xtfUbAw== X-Received: by 2002:a0d:e081:: with SMTP id j123mr4269568ywe.452.1579917758125; Fri, 24 Jan 2020 18:02:38 -0800 (PST) Received: from MacBook-Pro.localdomain ([24.14.135.13]) by smtp.gmail.com with ESMTPSA id h184sm3181072ywa.70.2020.01.24.18.02.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jan 2020 18:02:37 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jan 2020 20:01:51 -0600 Message-Id: <20200125020200.2049-4-rcombs@rcombs.me> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200125020200.2049-1-rcombs@rcombs.me> References: <20200125020200.2049-1-rcombs@rcombs.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/13] lavc/webvttdec: add support for configuring default style via AVOptions 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" --- libavcodec/webvttdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/webvttdec.c b/libavcodec/webvttdec.c index 7b2d1750de..494de08884 100644 --- a/libavcodec/webvttdec.c +++ b/libavcodec/webvttdec.c @@ -98,13 +98,16 @@ static int webvtt_decode_frame(AVCodecContext *avctx, return avpkt->size; } +ASS_GENERIC_CLASS(webvtt, WebVTT) + AVCodec ff_webvtt_decoder = { .name = "webvtt", .long_name = NULL_IF_CONFIG_SMALL("WebVTT subtitle"), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_WEBVTT, .decode = webvtt_decode_frame, - .init = ff_ass_subtitle_header_default, + .init = ff_ass_subtitle_header_options, .flush = ff_ass_decoder_flush, .priv_data_size = sizeof(FFASSDecoderContext), + .priv_class = &webvtt_decoder_class, };