From patchwork Sat Jan 25 02:01:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 17533 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 EE90544BC55 for ; Sat, 25 Jan 2020 04:02:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB0C768B1AE; Sat, 25 Jan 2020 04:02:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f171.google.com (mail-yb1-f171.google.com [209.85.219.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8BCF68B152 for ; Sat, 25 Jan 2020 04:02:43 +0200 (EET) Received: by mail-yb1-f171.google.com with SMTP id q190so1970580ybq.2 for ; Fri, 24 Jan 2020 18:02:43 -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=SIOUnZVl0drolgXTfRmR50JiVJ1LzNMozq+UZADS/5k=; b=puQCytQecRQ9xkGALNp6HRRF8g3hnLVBctEMliGY0nCN5yNGqpvKcQH4CIyeFzTvbo asR0s0iHGnCdBt0skEPGa0ZW9N/fjCiQc3Fr+qCPMJOmxI5ROA4eU0EqABki/eS78WDA NAVtmRYuARhaoHkXoV6pkevm0K1Nq0Q/H2V+cq838OF+SvAkkim2Gyu64zzE0ISvewwv liwUG+64cqdLQOGvx+pe9CqfJZ6TO0WPIZD4haJKIqCcYBRevxyQxKioFRExi6qWmpDU BucVKQmGiWyl2zFQoARLcvd3z9kOKweD8iY3LCkrZPpTNOkacFDSiUut/2ybkUPkRB6P PGiA== X-Gm-Message-State: APjAAAU3iGuinsc5UkJg47Sh0NfdQhMdaMPkolv0LEGvE4loi7WDEoSC BASHcB2X+pOAgbkAlBASo6g8YCXh0J4= X-Google-Smtp-Source: APXvYqz7n8X1Hwur2WGIWzI1IO9xm7UlcjE2oiY8E6M38YfcwZnuf/0+zvzqlVrmrCb+8EsIsUtlHw== X-Received: by 2002:a25:ce4d:: with SMTP id x74mr4748057ybe.340.1579917762156; Fri, 24 Jan 2020 18:02:42 -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.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jan 2020 18:02:41 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jan 2020 20:01:54 -0600 Message-Id: <20200125020200.2049-7-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 07/13] lavc/subviewerdec: 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/subviewerdec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/subviewerdec.c b/libavcodec/subviewerdec.c index 805c7dd547..7fbcf54d4c 100644 --- a/libavcodec/subviewerdec.c +++ b/libavcodec/subviewerdec.c @@ -65,13 +65,16 @@ static int subviewer_decode_frame(AVCodecContext *avctx, return avpkt->size; } +ASS_GENERIC_CLASS(subviewer, SubViewer) + AVCodec ff_subviewer_decoder = { .name = "subviewer", .long_name = NULL_IF_CONFIG_SMALL("SubViewer subtitle"), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_SUBVIEWER, .decode = subviewer_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 = &subviewer_decoder_class, };