From patchwork Sun Apr 1 02:39:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 8272 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1182005jad; Sat, 31 Mar 2018 19:40:18 -0700 (PDT) X-Google-Smtp-Source: AIpwx48zyp+HpJrjlg3qEjPNcJxmiDZwbZ1FxCbzRioxfGS7wFFdI/8aEe3rGoX1LNikKwsRNirO X-Received: by 10.223.178.228 with SMTP id g91mr3020436wrd.157.1522550418691; Sat, 31 Mar 2018 19:40:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522550418; cv=none; d=google.com; s=arc-20160816; b=oUX/Bosxi0nJMZYRiKNo9aFzuhI70gFPDnjg/1Krie5ao3eNW8w9RBWwrD8y+o7MoC XHFaGlAnc7t6HZCGEQQXBaI0/UzwcPcV3k41gnX5MM6O5rCHOfyeaenaN1j0kjtT3Aya OHXfwyf35pmAsI+5cvCPOhj0LYQIjvobE4Rx+GElfheDynvDjTMfWELEHIEDLaMIDOfj ap1DjKzgtRbd287fkytKEnmDIEP3GRQmz9oa6oMh9uYLoOokV0zCp3JbLjGss8dn5JfL FbDOAST1nOgGv9nnoXsnj8BW5Koh4N5u76LRw4OjQTjNyXPkTUVUYzujhr3aCQEDan/T XH/Q== 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:dkim-signature:delivered-to :arc-authentication-results; bh=jaklnL5dKCTkwBCcgP27kA00JVgUscdmVNt/+H82IYU=; b=F79ooQ8kuZb804V9asaBhklP66r2Rw9ei/wK/Fff4/JC+tK0fOaUyuFym0Hdt8Zh/L QOWBt53m+aNp8zMstHm7QgWpMqJrFKDD8nhF7Gm1e99OHkty6TLSlQbloTzLN6meILz5 /f/BZy+0DOf05gmKZKcHNZfIjgaVXgKwFcSPnX2hg+bjsEqOlXRHo+Wuv/Yb+CITTnmV fZSu2MkZik4JIzc6auEHBBz6L6A46Hn4gpIe8cp1eako1LTx7EtdyHXZk0YAMPNTcURl xa5l1exldDhmzUCrWnKC3neG/jJVN62rivArbiw3DzSSps70GyNErMBoKEhB6xu0J1q5 S4Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@itanimul.li header.s=fm1 header.b=Xi8J9kX/; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=Ft6RGh6+; 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 b62si385422wmf.209.2018.03.31.19.40.18; Sat, 31 Mar 2018 19:40:18 -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=@itanimul.li header.s=fm1 header.b=Xi8J9kX/; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm2 header.b=Ft6RGh6+; 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 02E73689C63; Sun, 1 Apr 2018 05:39:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 652E168987F for ; Sun, 1 Apr 2018 05:39:34 +0300 (EEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 449F020C77 for ; Sat, 31 Mar 2018 22:39:53 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Sat, 31 Mar 2018 22:39:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=lchN0J4gKIzLw05MB WivOS6PLa7YkxFr5GhekIf/rGM=; b=Xi8J9kX/XPA9HpBt1tui9EmdzRgWE1lCv 8S35p9EbBv6Tv7anhASae03FDAFLfDGvXpl9ce0CcJpsOhlvJp3aYe/WxGzFgmGB ClciJHAuddKMVCxRbFZS1P48q1YKm9FDNfg5XXcwJ6MbVpCQEmD2VZQXo/WlymtT kBGuiW3w4gY7jW5bLP6t/ATXkqL/ALZ6URIRg0WuMfPOt7QmMKZ5ZE/Q9e3O3hds 0JZ2tl6RaIgQUAEgPhnxd1mFf6nEVQRFIbt7YvQ7vM+B1CN2eSL5WBul6qWR7ORI r37qgtwnWIjQzcdvqCM7sKCS58wwk4zx0A3/KakBXMYEs7x/rQyiw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=lchN0J4gKIzLw05MBWivOS6PLa7YkxFr5GhekIf/rGM=; b=Ft6RGh6+ aBTih0Ny6vw377YPJMQAsZCxJE2SbbdVpqv1mW1rMmyDnHSZIQ+RQNbH+HKIssZt CAyscbjn+v2ZQQvzXsVONM3Qu5VbZgFPUEOImrq/jW+5F+viqqCRxkkerhtcxMz4 mfmY9/IUZplFRu1g+Og2LnhTGOrkoRzfrv0zwRRm6VMnItxKf6/metJRVOwUjo1Y lD/LmgtYrl/aNy/Z1gNhiP8jEAT3p35uIcgnh8kGBNwL3tUmrjQ07ZbPXbvECNCC eWHhb6jUgr0RDSDRb9KNlMslIuq/qHOjgF4eLqo99vmj4ePozvqfYSa0zi2Vmb4s yef4a9x67CNrlg== X-ME-Sender: Received: from localhost.localdomain (cpc75394-sotn16-2-0-cust168.15-1.cable.virginm.net [82.22.8.169]) by mail.messagingengine.com (Postfix) with ESMTPA id C5F0910251 for ; Sat, 31 Mar 2018 22:39:52 -0400 (EDT) From: Josh de Kock To: ffmpeg-devel@ffmpeg.org Date: Sun, 1 Apr 2018 03:39:42 +0100 Message-Id: <20180401023945.42053-3-josh@itanimul.li> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: <20180401023945.42053-1-josh@itanimul.li> References: <20180401023945.42053-1-josh@itanimul.li> Subject: [FFmpeg-devel] [PATCH 3/6] lavf: move avpriv function definition to internal.h 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" Signed-off-by: Josh de Kock --- libavdevice/alldevices.c | 1 + libavformat/allformats.c | 1 + libavformat/avformat.h | 2 -- libavformat/internal.h | 1 + 4 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index ebf95f8a81..adde749ce1 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -20,6 +20,7 @@ #include "config.h" #include "libavutil/thread.h" +#include "libavformat/internal.h" #include "avdevice.h" /* devices */ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index cf430a9680..d8d733735a 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -20,6 +20,7 @@ */ #include "libavutil/thread.h" +#include "libavformat/internal.h" #include "avformat.h" #include "rtp.h" #include "rdt.h" diff --git a/libavformat/avformat.h b/libavformat/avformat.h index ec4e5f45f5..a2fe7c6bb2 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -3060,8 +3060,6 @@ int avformat_transfer_internal_stream_timing_info(const AVOutputFormat *ofmt, */ AVRational av_stream_get_codec_timebase(const AVStream *st); - -void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]); /** * @} */ diff --git a/libavformat/internal.h b/libavformat/internal.h index 619063097f..23eb7e8a7c 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -731,4 +731,5 @@ int ff_unlock_avformat(void); */ void ff_format_set_url(AVFormatContext *s, char *url); +void avpriv_register_devices(const AVOutputFormat * const o[], const AVInputFormat * const i[]); #endif /* AVFORMAT_INTERNAL_H */