From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 398F444038 for ; Wed, 24 Aug 2022 16:25:59 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2CEBE68BA2D; Wed, 24 Aug 2022 19:25:57 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2061.outbound.protection.outlook.com [40.92.90.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 852B968BA0D for ; Wed, 24 Aug 2022 19:25:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KQq6tODEByrRe+RJ1/qqxfH+Hpb64t8YR9hobqLZeEOltlHezFUfCsx9LdO2sKchcgzQ37Xo02f73vw+kMFAVXHpnNHNbSPguNAl5sCocYg/dvibm6rzumA0lnesfvbw9NqTiROQdLsBkSKBzdwD7576n9C7Fs3FIOoc3YvxMXzEhJAvo70iwjflrXliwoEctLgCwqrFjv7Ap3+I8qb2/FaIb0yYgRkimLPr4y3RLqRb0hYlWHJTJFSooD1pGGdZI0eeai3GuDv+mtsB29BBhqjMqkyOXbrLJTD81u9YWloDUdZqXzI47H2pGdv5mUf4PJbPXyIvxOv4Xg0IteXE1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=g2albdC1YoGfXWUP5hXTqNbPSK9A/3rERlzUwmBxT30=; b=ILbtVIcNvMje/9sBKaHVmpbHF+RZr12FYZDj+A9J/aqs97mmzwDLNov0jlFARcMgha0v5dpr3mlFSIFrTM2Y+mHQ1KYM3rYbsc1ubw1dYysdgeVyQfmYIohmh0eeYBV15Kpw0z0eU07nWezf1sf/F7Z4tVsQBnnd0rmqT4+sUqm/v9cKQ6E/TQGGwtHkIes45kSYdHu4H0PLxtVFZ/GQAq/zRv36DqGQ0KmxsoBr3quVWqncXYJKz+cg8gyXc1HArHiOmskLFxOXdFtntBT1yd5flvAjHa8vH8XDHQWYUqYk8jOKO0ohsVVIgTsZ7STls663Sv4DEB3nYimnXPfkyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g2albdC1YoGfXWUP5hXTqNbPSK9A/3rERlzUwmBxT30=; b=bCMPdtnjhutscewWr6otvH1E7NdBVp2WPKus4N11eNN7V9S2wKBzJ6kHRfpbUU5I/GsAh4lItX1Pmjsue0cqeMiHDmgt0uyriwLY+3sWyS4/5asVP5frl63Z2P/FwD7WDSJZ2LHwJC0Fzw+Q0Vl1NTF/XS2pOdrBdDgaRO6LTUsYN/X7WsokobpyQvtuhxabYTPgbX74nd+TgmN9vwKR2jEqTRC/uu2K+ocDuCI3YARp5MBhTleufDi8hSmVaub4hbmXYwtc54y9qpt7OX6qNAvNYngd5+tib6eUqk6K0S7V4e2wVbHt9U3ZPJ5xCz1xTeTdbkpwaHLvujqKzltxOQ== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM0PR01MB6001.eurprd01.prod.exchangelabs.com (2603:10a6:208:16c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.19; Wed, 24 Aug 2022 16:25:48 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5546.022; Wed, 24 Aug 2022 16:25:48 +0000 Message-ID: Date: Wed, 24 Aug 2022 18:25:48 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220824084318.333-1-anton@khirnov.net> <20220824084318.333-3-anton@khirnov.net> From: Andreas Rheinhardt In-Reply-To: <20220824084318.333-3-anton@khirnov.net> X-TMN: [enLA9RK1D58V/hvHWw59XeiBLrZi1L79] X-ClientProxiedBy: ZR0P278CA0088.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <334a2187-6556-85e6-0eaa-fdc4a4562833@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6b20c38c-0547-4380-bf7e-08da85ed4dd8 X-MS-TrafficTypeDiagnostic: AM0PR01MB6001:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /tc8aa5swYeIq4llN0O2zBMApy7tQsWuCOyCKodMYfYWPGzSadwTvHjNtCscq0uSi4a5hVDky8UNEjK/oR0udtNj2o3tIEgxWo6RbrI5OpH+LXQ8c0d1AGr+FjRJJh4rG75fkNyn+pTdqWOQNcafK8fYh2FxaA/lhGL2GI1WxvFGaAHoELg9GOeeheuH9Esd7BkdrE490Y4J/RvjJkA29GSb30H55pTm03+KdnZ27iNWrTcNw+JTTxnkTUgIwAjq4EdImkkZAJd+NCBevzJceOmgyRgDUO7uQGN/KtxcDhPVN2MPPuLu5hUh1UPpwkstuG50PJKNbXYfK7XglwQScL/JT7ffc7hqlKiA3DnRWY5ZsHv/Z6KIou6Au2UWHpPkqTaIrnV7alQqHGmyTv6aQrUo9eE4rF6etc7Bp/x/w9tz3/Z32f0Mv0W+4sk9gPKuHlhYOYfCVRPnisQz0pWr4FK6jE+NrhJyMq9fTpdc/uQDtY039Ou9Tgy7WYLCEd8YS4NKx7BfJa+bdJmtdBOhCNAF05R82Lg69eu0MpsaDEkoIsYLWNF286/WlgPJH5Xta5tx4imrXUSG2NGbX2brpzycAGlmBraQwp+TtBDibmJGoTRYGwWUqI0DTPtRX9OPBX66UZFE6v5VA6/ppsmArqeQbpFJkul0/G3eYII2rKtEHj1dFeJsrGQQXjNy8P9i X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZUJubEJoZGQzU3NtTGVLOEhOWGVJM3NyZkpFMzFGTHVwMHZ2d3JudDFSckFZ?= =?utf-8?B?QjR5SHNlQUFMcEJ0dE1Kb3QxSks1TDd3N0R2VmZnM1NYbHlKVTQ5UXhWRjd1?= =?utf-8?B?MmZScFVGQVhYUFBmVkx3blZiZFNBZTRzT2lTOFJlbnRYS3FlWnpQeDdDUjhl?= =?utf-8?B?RzgvN0l4VDIxczNCSS9HSmljcEFkZVRYekkwTHBqdW1nZ3VIZE91ekIyTUtW?= =?utf-8?B?N0ljby9NZ2Q1cnNBK1pXY2tKVW51STBBcDlZemFHYkEyRkdkYVhMbithVnpN?= =?utf-8?B?bUQyVFZ1dUVsYzRLMDBGTElDdlpjejBueno3QXg0VDlDcGpWWjZwMjRxS0tk?= =?utf-8?B?L3p2d0VydzBGZXVYc0tnbmFvbklpY3k2dlBFS1R3aFlmREk3WklvMGUxL2hG?= =?utf-8?B?TTFTTFNLNkZoUkUvU2p1REljQVhFNXhrZlFqQkZZSEMzcGFyTjNFZUM4elJJ?= =?utf-8?B?WWhBZGxpNUFQdWw5ZDJiR2lmV2oxc2t5WUdYYTZwT2NrZUtDcmU3b3prU2s1?= =?utf-8?B?dkYzc2I0ZHUrZ05WRTlQQ0ZOcnNqTlg4TnhLUk5Md09Ubmo5cFNoZFRJdWZj?= =?utf-8?B?TFdTeEwxd1JkRHAwYmpmOG9mc2NjdmFLcko2K3FkTTJVb1hhcUl2bWdPZm5E?= =?utf-8?B?LzZVQjhFbGNTQ3RrOW1kRkFNeGdQbmhzWFdkQ09SN0txUE14T1dST0lrUDM4?= =?utf-8?B?bHhUdEpGUldUdW1UU2FaYzkvRllIZ3BLZ0ZOVXhPWjNpdlhKTHZWSGdUV3Zz?= =?utf-8?B?ZDZsd3BTSUxvaEdBWTdrYSsrS3U5ZG9tRVEzUitHb2RWdkRtTFFaSTA0dmU2?= =?utf-8?B?Z1lxem56aG8xYUpJRlVkc1B4OC9PQ2JFQzZsVllmN3BKU3FuL1Rnc25BZURY?= =?utf-8?B?a3JEU3pNSklUelhlOTVhemFyS0MxcE9oeCsrSExmQUYxT2IyUGdqWk10d0NW?= =?utf-8?B?ZmFWY1cyZnY0NjQ0OGdYaUE1RjdUeEppQzlTVitjektvU1pzZVZIaTZyRUIx?= =?utf-8?B?YVVvM09CMVhUNFpnbk5rWDNtMUNlTUlrcDc5dXpoTkMwNzZlSmhqMmVlZ1I3?= =?utf-8?B?VWZJR0FrazFmVHU4bVlCcDRJbjdISFFXcmFMVlNCNVhTQm9uc2lEdFNZcTBv?= =?utf-8?B?OXhWNnVsM05iVzl2Nno3OHZpbnBDakdHSTFPYk1VWk9KYmxqWG5oZlFsY3Zu?= =?utf-8?B?NThRRkVrMDNBRU1aSmxXY2RrckxYM3hkV29DaDlPVmt4bjcwWVppdzBZU3lC?= =?utf-8?B?c3ExM2J0ZGNOREhKRjBydC8xRDhKY3dobUh2bUJDblB0V1JFdFhSbXQwSHNm?= =?utf-8?B?MW5ZV0tmVkduaFBHcG1qclFBMTJTcVJ1bXZKRHZ4T3BJQUxQZy9qNWFlbkJR?= =?utf-8?B?VG8yb2ZaNk9uT0Q2U3FiaHFXQ1IwUUNkdVR6QUpiRnpXNFhaanBXQm0wczNj?= =?utf-8?B?ZGlyQjNra29yVDNIMFExVlp3a3BML1lmb1VLTjIxMG4zVXk0WklxWTg0MUFV?= =?utf-8?B?YjlZaFpFeHBSZFB2WlM4eDF4ZUVWVHhrWlRVSE1ZUFNJMkdaMmZCSXVmbTd4?= =?utf-8?B?VEM0OVZUUDNPZ1g0MkhOSzJzcDFRL21kYlNLdUZyTjc4THJoc3V2YUJoTWpx?= =?utf-8?B?Wmd1R1ZPTWlET2grWFY5enR3TnYwM1NlbE5DWHE5a3JTN1NIeVNMNjkwdXhz?= =?utf-8?B?bU9PWGx1SlIxOVZOWG96TUE5c2VMN3VGWkJMSWtkS0RNZGJya0tmaDNlUkFi?= =?utf-8?Q?6WfIuqohXQltbTpLVs=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b20c38c-0547-4380-bf7e-08da85ed4dd8 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 16:25:48.8796 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR01MB6001 Subject: Re: [FFmpeg-devel] [PATCH 03/18] lavf/dv: always provide avpriv_dv_* symbols X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Anton Khirnov: > They are used from libavdevice. > --- > configure | 1 + > libavformat/Makefile | 3 +-- > libavformat/dv.c | 23 +++++++++++++++++++++++ > 3 files changed, 25 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index ea50c94002..f4c4ab0484 100755 > --- a/configure > +++ b/configure > @@ -3530,6 +3530,7 @@ gdigrab_indev_deps="CreateDIBSection" > gdigrab_indev_extralibs="-lgdi32" > gdigrab_indev_select="bmp_decoder" > iec61883_indev_deps="libiec61883" > +iec61883_indev_select="dv_demuxer" > jack_indev_deps="libjack" > jack_indev_deps_any="sem_timedwait dispatch_dispatch_h" > kmsgrab_indev_deps="libdrm" > diff --git a/libavformat/Makefile b/libavformat/Makefile > index f67a99f839..684bad0eb4 100644 > --- a/libavformat/Makefile > +++ b/libavformat/Makefile > @@ -13,6 +13,7 @@ OBJS = allformats.o \ > demux.o \ > demux_utils.o \ > dump.o \ > + dv.o \ > format.o \ > id3v1.o \ > id3v2.o \ > @@ -184,7 +185,6 @@ OBJS-$(CONFIG_DSS_DEMUXER) += dss.o > OBJS-$(CONFIG_DTSHD_DEMUXER) += dtshddec.o > OBJS-$(CONFIG_DTS_DEMUXER) += dtsdec.o rawdec.o > OBJS-$(CONFIG_DTS_MUXER) += rawenc.o > -OBJS-$(CONFIG_DV_DEMUXER) += dv.o > OBJS-$(CONFIG_DV_MUXER) += dvenc.o > OBJS-$(CONFIG_DVBSUB_DEMUXER) += dvbsub.o rawdec.o > OBJS-$(CONFIG_DVBTXT_DEMUXER) += dvbtxt.o rawdec.o > @@ -711,7 +711,6 @@ SHLIBOBJS-$(CONFIG_RTP_MUXER) += golomb_tab.o jpegtables.o \ > SHLIBOBJS-$(CONFIG_SPDIF_MUXER) += dca_sample_rate_tab.o > > # libavdevice dependencies > -OBJS-$(CONFIG_IEC61883_INDEV) += dv.o > > # Windows resource file > SHLIBOBJS-$(HAVE_GNU_WINDRES) += avformatres.o > diff --git a/libavformat/dv.c b/libavformat/dv.c > index 1dadaf6e62..24bacd5c53 100644 > --- a/libavformat/dv.c > +++ b/libavformat/dv.c > @@ -28,6 +28,9 @@ > * License along with FFmpeg; if not, write to the Free Software > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > */ > + > +#include "config_components.h" > + > #include > #include "avformat.h" > #include "internal.h" > @@ -40,6 +43,8 @@ > #include "dv.h" > #include "libavutil/avassert.h" > > +#if CONFIG_DV_DEMUXER > + > // Must be kept in sync with AVPacket > struct DVPacket { > int64_t pts; > @@ -647,3 +652,21 @@ const AVInputFormat ff_dv_demuxer = { > .read_seek = dv_read_seek, > .extensions = "dv,dif", > }; > + > +#else // CONFIG_DV_DEMUXER > +DVDemuxContext *avpriv_dv_init_demux(AVFormatContext *s) > +{ > + return NULL; > +} > + > +int avpriv_dv_get_packet(DVDemuxContext *c, AVPacket *pkt) > +{ > + return AVERROR(ENOSYS); > +} > + > +int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, > + uint8_t *buf, int buf_size, int64_t pos) > +{ > + return AVERROR(ENOSYS); > +} > +#endif // CONFIG_DV_DEMUXER This is unnecessary as the Makefile above ensures that dv.o is built when iec61883 is built. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".