From patchwork Mon Jun 25 18:47:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 9504 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:141:0:0:0:0:0 with SMTP id c62-v6csp4444401jad; Mon, 25 Jun 2018 11:47:15 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJvaT8CH0VbU9w/kWBVVaZQUR5tj3nqayYpylCTyw1C7GEcO8OTUuW6eCvsvJnd7JOMNiM4 X-Received: by 2002:a1c:5c93:: with SMTP id q141-v6mr1855191wmb.77.1529952435570; Mon, 25 Jun 2018 11:47:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529952435; cv=none; d=google.com; s=arc-20160816; b=OaHfGWA8owLicIK6Kv25SEN+M06HtOEF8V3FIhefUMRmGy3xx/sO4iEHEzC18xxwGs Aif/Ed4fap+tgNjZxWRMa/5TUQD5rG0Zz1enqg/YwrvCDguw4oMN1Utqq0+3H6fiR8Gs aMjOdgrTJTIjL84HHlfNSQizp7V9NVVIcYM/2XLDUpfrOMx9PFzQarxXrfIYi50taPAo WIxzKpId5AK8BPHOF9W8nO3unILbHxmixpbu7rEBwfU97wqqrKprIujkldz78retqSNL lTAC2e0dRwGoO3STH9h0jHLTTtu+Rz1e+0x4gA1vvugVEaLooJsowd44boTo0MEq5C26 PcOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:mime-version:user-agent:date :message-id:from:to:dkim-signature:delivered-to :arc-authentication-results; bh=grKUvBHUWTtjpw8RU+pkNA276CgYUyghfEkAPS/TSUc=; b=ggIk/Rx8wTVG4lbUmEdv117KGga2MNrHCxKLfdUqmzbxxguuNKAIQqd+wsQp6xuj4y akqEiVNpSn9nut31pctjlT0ltoVV9Q8gyIoBeJJ7vctFH+veqDihnmOBHEB0eX3nwO7o o3vAo1bp1V1rRA81TBpB0eUHyQ5em5S6NU+P6BYdhvPgIC/FPtFe2e8Y45gNvH8pbTfh 2hzfqYgfhjqu8r8QXEvJiDBhIlEiqPyVMovsDHpMWd2DZu98N7cdcskYJo4e26M8sAHl 2i6SOecqZp9qfoQa7FsUIriCabK40IC1nmXrLmlYiBbqKMbzJEn1CThbaaKhSvGJSWZT k69Q== 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=uUI1AH0D; 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 90-v6si1221086wra.396.2018.06.25.11.47.14; Mon, 25 Jun 2018 11:47:15 -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=uUI1AH0D; 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 0BAFE689CD8; Mon, 25 Jun 2018 21:46:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f178.google.com (mail-wr0-f178.google.com [209.85.128.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87C8C68064F for ; Mon, 25 Jun 2018 21:46:10 +0300 (EEST) Received: by mail-wr0-f178.google.com with SMTP id k16-v6so14717356wro.0 for ; Mon, 25 Jun 2018 11:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=Fxz/sB97dsPYHEMapUtUf/gbXVQtrQ0vNMpAV9pkcns=; b=uUI1AH0DZ900ugqkRayloKgSxFxnVxNU164izS9JUMOMV4/ZWJLtVWllRf2z2T/kWg hQPV5cnq5LFSI051g8NMb/8eDN2nmLgGhIHmLxl0g1oUWlCPgBf0wj+J5QEOVcyE/qwA k9rulZelBgdoO9wYFXJPvhVtOqEYkzxSS0fwKUXyypONYU4rvv+j2CQBlqHKozOLq4oW Oboaoia5zsFtP4t+BBLwZgFK3wfpIjEm9bCcMHBVw4PHDCBt1o7Zu/RyEXmivPS09cYS zJQYcLGaBLqPmOQOlKFy1fLwciHJjmqOXeYpZk4J1MNNZnz9qh5mMKFKgx25fqElgHSn QDqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=Fxz/sB97dsPYHEMapUtUf/gbXVQtrQ0vNMpAV9pkcns=; b=aY/yUOs322y3ZFTu3G1MPWJCPQn9/CW6bXUE1/aHteSMZbcdlFW6UQKy41PhGKkKX1 q/pMmdSl6NjvJzebE1GV51wspgFQEj1nuf+C8mHdEXjW8OQ2qaLesmPnYOw8//tALirB zjt1deftd225l0+KQfhP3xZKsLgwbbB6dWDDEdLJbIbxlcbpaz5ph0tjQOtX/ra75rEI DxidRZpslYDbGIUS/71GHqHgpbjg7TLgvQEJUsu1TuBppIwBdH2mjuWMFKWNPwQtY2ZA kkRl/c4nz8u9U9L7dCEdvb6dHT8Tl1h/2FXrLHgXjWxujcCHVv2KopiJ5tEG0oYT3NvA +mqw== X-Gm-Message-State: APt69E3eP7mV9GoMfYqLLl6N+MOS1qyQlrz8XvhIyjU4CLxBWYI6JUcU xcFDftGPV8uu4mp5uk+2S9AbjbML X-Received: by 2002:adf:8b8c:: with SMTP id o12-v6mr11235055wra.169.1529952425104; Mon, 25 Jun 2018 11:47:05 -0700 (PDT) Received: from ?IPv6:2a00:23c5:418a:8b00:5afb:84ff:fe66:bcaf? ([2a00:23c5:418a:8b00:5afb:84ff:fe66:bcaf]) by smtp.gmail.com with ESMTPSA id p196-v6sm18511326wmb.20.2018.06.25.11.47.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jun 2018 11:47:04 -0700 (PDT) To: FFmpeg development discussions and patches From: Mark Thompson Message-ID: <568d668b-1baf-3e35-7ae0-8863f6d31911@jkqxz.net> Date: Mon, 25 Jun 2018 19:47:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] lavd/dshow: Add namespace prefix to global functions 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" --- Not tested at all. libavdevice/dshow.c | 6 +++--- libavdevice/dshow_capture.h | 4 ++-- libavdevice/dshow_crossbar.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index de910c0994..6f613f31b0 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -509,7 +509,7 @@ end: * Pops up a user dialog allowing them to adjust properties for the given filter, if possible. */ void -dshow_show_filter_properties(IBaseFilter *device_filter, AVFormatContext *avctx) { +ff_dshow_show_filter_properties(IBaseFilter *device_filter, AVFormatContext *avctx) { ISpecifyPropertyPages *property_pages = NULL; IUnknown *device_filter_iunknown = NULL; HRESULT hr; @@ -581,7 +581,7 @@ dshow_cycle_pins(AVFormatContext *avctx, enum dshowDeviceType devtype, int should_show_properties = (devtype == VideoDevice) ? ctx->show_video_device_dialog : ctx->show_audio_device_dialog; if (should_show_properties) - dshow_show_filter_properties(device_filter, avctx); + ff_dshow_show_filter_properties(device_filter, avctx); r = IBaseFilter_EnumPins(device_filter, &pins); if (r != S_OK) { @@ -886,7 +886,7 @@ dshow_open_device(AVFormatContext *avctx, ICreateDevEnum *devenum, goto error; } - r = dshow_try_setup_crossbar_options(graph_builder2, device_filter, devtype, avctx); + r = ff_dshow_try_setup_crossbar_options(graph_builder2, device_filter, devtype, avctx); if (r != S_OK) { av_log(avctx, AV_LOG_ERROR, "Could not setup CrossBar\n"); diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h index 475d62ba99..79c004a87f 100644 --- a/libavdevice/dshow_capture.h +++ b/libavdevice/dshow_capture.h @@ -346,9 +346,9 @@ struct dshow_ctx { /***************************************************************************** * CrossBar ****************************************************************************/ -HRESULT dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2, +HRESULT ff_dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2, IBaseFilter *device_filter, enum dshowDeviceType devtype, AVFormatContext *avctx); -void dshow_show_filter_properties(IBaseFilter *pFilter, AVFormatContext *avctx); +void ff_dshow_show_filter_properties(IBaseFilter *pFilter, AVFormatContext *avctx); #endif /* AVDEVICE_DSHOW_CAPTURE_H */ diff --git a/libavdevice/dshow_crossbar.c b/libavdevice/dshow_crossbar.c index 95fb466f4e..2438683cde 100644 --- a/libavdevice/dshow_crossbar.c +++ b/libavdevice/dshow_crossbar.c @@ -137,7 +137,7 @@ setup_crossbar_options(IAMCrossbar *cross_bar, enum dshowDeviceType devtype, AVF * Given a fully constructed graph, check if there is a cross bar filter, and configure its pins if so. */ HRESULT -dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2, +ff_dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2, IBaseFilter *device_filter, enum dshowDeviceType devtype, AVFormatContext *avctx) { struct dshow_ctx *ctx = avctx->priv_data; @@ -163,7 +163,7 @@ dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2, hr = IAMCrossbar_QueryInterface(cross_bar, &IID_IBaseFilter, (void **) &cross_bar_base_filter); if (hr != S_OK) goto end; - dshow_show_filter_properties(cross_bar_base_filter, avctx); + ff_dshow_show_filter_properties(cross_bar_base_filter, avctx); } if (devtype == VideoDevice && ctx->show_analog_tv_tuner_dialog) { @@ -173,7 +173,7 @@ dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2, hr = IAMCrossbar_QueryInterface(tv_tuner_filter, &IID_IBaseFilter, (void **) &tv_tuner_base_filter); if (hr != S_OK) goto end; - dshow_show_filter_properties(tv_tuner_base_filter, avctx); + ff_dshow_show_filter_properties(tv_tuner_base_filter, avctx); } else { av_log(avctx, AV_LOG_WARNING, "unable to find a tv tuner to display dialog for!"); } @@ -185,7 +185,7 @@ dshow_try_setup_crossbar_options(ICaptureGraphBuilder2 *graph_builder2, hr = IAMCrossbar_QueryInterface(tv_audio_filter, &IID_IBaseFilter, (void **) &tv_audio_base_filter); if (hr != S_OK) goto end; - dshow_show_filter_properties(tv_audio_base_filter, avctx); + ff_dshow_show_filter_properties(tv_audio_base_filter, avctx); } else { av_log(avctx, AV_LOG_WARNING, "unable to find a tv audio tuner to display dialog for!"); }