From patchwork Sun Jun 24 18:25:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9487 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:141:0:0:0:0:0 with SMTP id c62-v6csp3283701jad; Sun, 24 Jun 2018 11:26:04 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL3n9iLjlgGdsQRMOV7bQNY3/w7mJ8ZNyka9M6BjJdfrG3Wra/4VvZnTIOQmphq0NvNkEZ0 X-Received: by 2002:a1c:b49:: with SMTP id 70-v6mr6682639wml.5.1529864764587; Sun, 24 Jun 2018 11:26:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529864764; cv=none; d=google.com; s=arc-20160816; b=n0QwbhCfGo3aGXVQq+1YWDY/3NL/5vftSJMMSnraeXxakH7tI0kBWEPCxwfMewqZt1 J9/d2rtFaMDiJkDtbdp4zPT2ItDKAyM/IVLeiIzK9Ot7ZPmD2B2XQythKJQrV/3/BTO8 KB2cofF0m3/V1St/Mirw5PYB759V3jqdw5V8Hyo2362lw9j/APh1Dy0uNR4h9AHNRXUc ivGrj2mtLnNPt5a3Q6bZKFPP+r+YF7Q8hutbdKJtGDf36m5BNWtKz5R4yhMYwkbIzRqz 4rXAMZ0r+iL61JurJCSmUgh/2wMjFO2IastSlCRgOtcZnStB0MPOtUvS33zJOGdo/c5K zV+w== 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: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:dkim-signature:delivered-to:arc-authentication-results; bh=nPWVHLwMbjaqgkQ/ciYZ74gWwcphKNKv1tclKx6G7fw=; b=LA4ukv0Tzf39A2vZ+GBAV8frUUtJEKz4DE11FK/owrF/dUDY5SeFdiUXNrhNKPviwI hojDXAWE1B5PvtWMAzjYt7oxmU8l7ui5D6S6k3b5vUVNm44vB63nd+oNu4qMQAc7xwKe 1t75ISyZjW0aXlJyBFw7HiptNkeB0j71Wt5s4DT9VYHSgsfz38Airb6ddVnNmWT2O6pf gqbopkKPotCDI2QuGDP6DhI1agKwkgSnOz/y4ndFad2G0fzk6HLpUCCDzJ+T6aSAXqwT yWGb4Z6IjkCPr/sNEgKwccf2VU44lXbKSt0j0s+o3KFd2zEtLbY8k6zn5IVa7hXh72p5 24aQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=cNIc512I; 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 x20-v6si3215056wme.197.2018.06.24.11.26.04; Sun, 24 Jun 2018 11:26:04 -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; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=cNIc512I; 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 25273689B63; Sun, 24 Jun 2018 21:24:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f170.google.com (mail-wr0-f170.google.com [209.85.128.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CC0E689AE2 for ; Sun, 24 Jun 2018 21:24:51 +0300 (EEST) Received: by mail-wr0-f170.google.com with SMTP id w10-v6so11362231wrk.9 for ; Sun, 24 Jun 2018 11:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=f/nQqX0Q7TRJj3XaTEJWmQbbZeUy0V7yWZZqbiZZ8Os=; b=cNIc512Is8ycwOfws9xngczqcVm4Pn6uDNaVYwZKlJQM/0ghuUhn0D9ZtTdX0draMh ZieP9UT8Hg0WOmKXS1NRPu8axB9Vx2FPubM2TI7pHrTiMP9gfTL+TbZYSVmEBAf6OwgS r5bHkoxNrHKRRX/c6MqrRHphewlhsBv/db5Ui8wJFiVq3stXwgv/oOBKMwHxq0hhN798 d1KtrvrhpfvQEUHjsYNcZfoj5CDvaUaru++zwK3ScB5+cg7uk+zFtW4qDA8NHx3PtXmT cQkxZlKS0zetet/ubQ8p/SvOF3b1ji2CSG/447pCz0KFLyn8LyD6Ibi0RRRpzeoLuEHV BFIA== 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; bh=f/nQqX0Q7TRJj3XaTEJWmQbbZeUy0V7yWZZqbiZZ8Os=; b=T/sanGiWb8M1qTkk9CB6kKnx3w/Gh/yZVvAKFTMMBIrCR5nCZxPShZMsD5yog1RcU2 R2vNPniCdgNi9uScMz1BC5zhUMkDL9JK++iL1Ys4fpuo6WQ0BNSjBj51+kT84bH8k7Yy Tp02ji6BdHeHeiu/oj8c65hcXLiphRpAf3qkFQQC0aoVhwpOLNVm6WqOwm2wUpvecfrY CewaVfH3zjPr2AQoK3SGy0yz9PDBLH4sNLQu9/WUs6Fp/utA17Gw9lHo7jWFJHqFJ7Qg 9Dt+bDBr+FQ2+Iv7+htZp0+7SQooA32/WbGZ2g6V7KN7ffRDlXRM42ismLbbYgmyHsvN 9zvg== X-Gm-Message-State: APt69E1d2bNqVzNEK+aVr/d5PuLaCkUQP1dG6JVyqy73UWcXS+N6y/Pr j/Ha2dy5xamA1kfurJUW1vrCTF7UHD4= X-Received: by 2002:adf:a45d:: with SMTP id e29-v6mr3970195wra.121.1529864745862; Sun, 24 Jun 2018 11:25:45 -0700 (PDT) Received: from lehr.home ([2a00:23c5:418a:8b00:5afb:84ff:fe66:bcaf]) by smtp.gmail.com with ESMTPSA id a2-v6sm5089929wmb.6.2018.06.24.11.25.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 11:25:45 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Jun 2018 19:25:37 +0100 Message-Id: <20180624182539.32194-3-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180624182539.32194-1-sw@jkqxz.net> References: <20180624182539.32194-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 3/5] lavfi/framesync: Add namespace prefix to framesync_get_class 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavfilter/framesync.c | 2 +- libavfilter/framesync.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c index da12c58a61..22d3f091a3 100644 --- a/libavfilter/framesync.c +++ b/libavfilter/framesync.c @@ -61,7 +61,7 @@ enum { static int consume_from_fifos(FFFrameSync *fs); -const AVClass *framesync_get_class(void) +const AVClass *ff_framesync_get_class(void) { return &framesync_class; } diff --git a/libavfilter/framesync.h b/libavfilter/framesync.h index abf3bf552b..37743cccb7 100644 --- a/libavfilter/framesync.h +++ b/libavfilter/framesync.h @@ -211,7 +211,7 @@ typedef struct FFFrameSync { /** * Get the class for the framesync object. */ -const AVClass *framesync_get_class(void); +const AVClass *ff_framesync_get_class(void); /** * Pre-initialize a frame sync structure. @@ -304,11 +304,11 @@ static int name##_framesync_preinit(AVFilterContext *ctx) { \ return 0; \ } \ static const AVClass *name##_child_class_next(const AVClass *prev) { \ - return prev ? NULL : framesync_get_class(); \ + return prev ? NULL : ff_framesync_get_class(); \ } \ static void *name##_child_next(void *obj, void *prev) { \ context *s = obj; \ - s->fs.class = framesync_get_class(); /* FIXME */ \ + s->fs.class = ff_framesync_get_class(); /* FIXME */ \ return prev ? NULL : &s->field; \ } \ static const AVClass name##_class = { \