From patchwork Sat Jan 25 02:01:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: rcombs X-Patchwork-Id: 17536 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 82CC144BC55 for ; Sat, 25 Jan 2020 04:02:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D80F68B1B9; Sat, 25 Jan 2020 04:02:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com [209.85.219.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E62568B151 for ; Sat, 25 Jan 2020 04:02:46 +0200 (EET) Received: by mail-yb1-f174.google.com with SMTP id w9so1961891ybs.3 for ; Fri, 24 Jan 2020 18:02:46 -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=3h5FPrqVo864QeDfVnIp4tzBU8TRug3BpG7GDK7qYCc=; b=q8e9jKdShKk45l8AjZd9T2G+xJu0gL403FOtBDPJVD2nz7HBvGi5Hl7ZWGksr0nK+a RBoVwGmK2tPfRG+uTo0vSSl+R3Iz5tuLS31DOy3M1U+rK15iqEvI919N5D/BwyZ1T0HT twpmrqpS65BECuBobaoainiMkSw+/gfTbvHTw5e9gvmfCQ0Lg6BluPYjn/cy+ZZnYD+d DQYfj1IZ9rFZbkwS7ot/k3E6op5PvUw358fv8FhPkwjqOMnEsbYskoolQJliiYYQ8ud+ faUPTAWNoE78UAtoWZIMe7pZSqa1mqfgv4AG4QyNK7VdPdiI7+4BbjQCiVfa5js163Uj sFxg== X-Gm-Message-State: APjAAAWwRLkc3RmRVPbgiFO9r5bfe9je/9pykz63mdhEoxEGlPfXrdzF U3kJ1kt2rDX9P8tyIND/jxj6Qge2RWc= X-Google-Smtp-Source: APXvYqw4xDSbKieNYNYDknrZ3VbZny7cxGWWg8cJcOc2HxUixg1Z7psV9mmaxZD27ituLmb26MK+fQ== X-Received: by 2002:a5b:5d2:: with SMTP id w18mr5127450ybp.349.1579917764491; Fri, 24 Jan 2020 18:02:44 -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.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jan 2020 18:02:43 -0800 (PST) From: rcombs To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jan 2020 20:01:56 -0600 Message-Id: <20200125020200.2049-9-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 09/13] lavc/mpl2dec: 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/mpl2dec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpl2dec.c b/libavcodec/mpl2dec.c index 409e4b3708..f426f3080b 100644 --- a/libavcodec/mpl2dec.c +++ b/libavcodec/mpl2dec.c @@ -81,13 +81,16 @@ static int mpl2_decode_frame(AVCodecContext *avctx, void *data, return avpkt->size; } +ASS_GENERIC_CLASS(mpl2, MPL2) + AVCodec ff_mpl2_decoder = { .name = "mpl2", .long_name = NULL_IF_CONFIG_SMALL("MPL2 subtitle"), .type = AVMEDIA_TYPE_SUBTITLE, .id = AV_CODEC_ID_MPL2, .decode = mpl2_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 = &mpl2_decoder_class, };