From patchwork Sun Jul 31 09:41:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37053 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1872497pzb; Sun, 31 Jul 2022 02:41:48 -0700 (PDT) X-Google-Smtp-Source: AGRyM1soEEJs/y3jcZIOZCgYAacHShwkAUuWYfrOpkEihf+zRewoTrW4nkR2oesmpCiA6hOc/ZZm X-Received: by 2002:a17:907:1c0c:b0:72e:e206:bfed with SMTP id nc12-20020a1709071c0c00b0072ee206bfedmr8163908ejc.682.1659260508152; Sun, 31 Jul 2022 02:41:48 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dt5-20020a170907728500b0072b6a93c5ebsi9054583ejc.60.2022.07.31.02.41.47; Sun, 31 Jul 2022 02:41:48 -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=@outlook.com header.s=selector1 header.b=gExwICM0; arc=fail (body hash mismatch); 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7AC368BA1D; Sun, 31 Jul 2022 12:41:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075032.outbound.protection.outlook.com [40.92.75.32]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E009368BA1D for ; Sun, 31 Jul 2022 12:41:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y/DCfXEJCtlgwkaNpubhMKQD6s90xvA1i0abREbDrmFkOzQqFD00nbckXXsvZLh6vUxMIKmUtYWjVCmSrG+X0gtcaNjasn+Ms0YeSkc24/mMBH0qq1dfish+zjCj6gHzREUe0VdYzAkT6cAIT+kxl0E7rSM1kzBHtWwDkfuwOUaSmjcgC49djcmYRo5iL6JLfCYEMWeDtGg54lJioKWnNhiQA9vzbz7cMDoKN3f4NFdJe8D1dne5GFLXhUhaEZ/n36GGeIJ/4hkSjQXSvM1AWofBLSCKdoiyKzJ6tBl1GH04Ksn5EWEWaGTLUnE22mTJYxWUKmvHN27Mr22Gc9fSBA== 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=bAjvix4JFliR3aHGUxQMkJSGO3xezA9t9LddYtLrIFU=; b=CdC5HU+URPBhveETOKbC7uQuQn/QMgfqVZFK0jxwQ3OxXNcYT2i9rhUBtJLyP5cUklRTfFa1ZI+asZmq2izLsQg5T6A8X43mWO1pMxxApPeslQWhcj9r3djri6lQwClJaDlfj185nHGE5wBTW4R/tY3hBmHTj7fhCrm7DuO5lFKhEtBY9sgnwT6ZH8Q3YTfy9kwZN9Sx1KI7sONQquhMoHdPtKZWYtsySCNy2WUGsG5XAOMRwuy7X98nIKWWRRShvJ8pfGa11M/qAnBvHjh2D4XpeB1sMu3mqhP66T8giq08hvCXuCF6soSWLyzD8IjyZlKyjA/X3kwnRnfkDYdNHw== 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=bAjvix4JFliR3aHGUxQMkJSGO3xezA9t9LddYtLrIFU=; b=gExwICM04XGuZRg6QpN1ZR2HpUQc+46h1BHFjFl9B4Y0JkqeUFXUTwHOsWHcu/9uYv0iZidd5+R+z2Kx88ojlxsgut2rwq2pZwwqnfbo3rh7VOHUNTgDLdh1LA8CY8h76h+DTT/Qn0B1LKCaxNB6vteGohoTTWgsTLl7TdKzY2x/PkN3UzSsE4i6myWMGaHEj0Uqo05mHKYfA9nV1VykHCB0FSDf4LCVylQFLBWZTQlpws4P7q+WJ61apuf3r+q+rmtwQkDtp+FbKZbEMOhTQHRJPVGyTkcshEp1+a0+qYZsc+6b1g6bUscNtPBs0eiazX46rnBH3bR6xf6f7EZQ4Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR01MB4574.eurprd01.prod.exchangelabs.com (2603:10a6:803:a4::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.10; Sun, 31 Jul 2022 09:41:29 +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.5482.014; Sun, 31 Jul 2022 09:41:29 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Jul 2022 11:41:18 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [NLPqOttTcX4SljnFkPdxAI3kd7GQw5hb] X-ClientProxiedBy: ZR0P278CA0035.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::22) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220731094119.1701898-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5e288401-3be6-408e-b393-08da72d8d7e4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTYJKRSe9Ri/N60nt0LRYq+MnUG0p5RP6aNbYb40h0A8JlInd8VQuJg1cqECAbdoeJI8zSknuToQs1A1KaXPBqTRanN33kuQChBpruuYydhOagM674wYTRnOtBNu75SlrjEtdi1dBrtfwGhZJ9p1Pp3wwbQWrDhYk7fRwM48yyvXa9eZtiJw/Ol6Egok06rhj8M3tqIwErJENmgoBDGHraGIw4ooXNRE0zYjj7YNLtXbb8VI+w588UA+bYfvNn8azKo/E2Iz2BdWJ1T//XpBVB5OnW7nkD9QzLCCn0xElGj4otW20CmtjmAVXFGz0QCzcyp7I6i+xVn727hJurwWRIRCTAk2jhfbaTg88Gwz9eGpDsIyIcXJJTIBzKxCcv8pWo6jGm/Nb5qDTE7Rk+1bUklP+s9whPqxn9uOVPfKYh1bBfejSitEpwqhzi3pgaA6K2SyQY49TxK+SoNwVV8qTj0fdvJcQ48Hsa4mRAm8/1p4Au0CA9hMpAXeN8bb2HilNoWDzUPtxxEgroer2pQY7mra6H3yz1rO1J4ldgdKKz//EDEM754Kyiabh1dkM2zDXLD5JbQmmCfWgQtTxtvzTe7PuN1HM96B89/1Pc6rlEBsPYLeuK1cUJPKlef/+ZSwbEMP3s3dbJrzqgX4gHA+2tIFZVA27sOEF3vQfVctRwVD2VNeYtQoAUJXzBtLaXEG4hhWrSfBw/ORzPJmKEkKGH6cRuganUxboKYeY27fra6dEcpv4I+34aBTYaUZJx0UKw= X-MS-TrafficTypeDiagnostic: VI1PR01MB4574:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /jWDa+sHVPLdBr66i/mJnyt8+G7Ri/JkTOi30D4p9FkmFBTPLNCQjnKsRv/+3lfgidQdtKmKyOe6o31P2CeNdeXl/YXC5iLLDznGluguAzCJlA+/509y4P/MAUZzFEozD0Ee1fAk2oN1runEZLH+xfIHtOmjL1ZRw7tmG/pUFHCNLQUjttnZOJzHCb17vrYOy9AX+U3NWdCyfLF/PcPA/EC048H/ncpebwjn2MDRATJtylqMleEL5QESVXsAtEN3UQq63lvb57vBuMeerdUrmHZ/ObDw/1NezHJjhAqz2dodyfVSAY7Iy179p72wjDSEw1e4AWx2MNMvFl3gZ7KRcnMVo/MMAEJM2igIIhUyyYcxXsEJaIzS8SSQUNWffe4ookLguhcVvSWtGpSfSgi0z83kznexduvhpMIOJWOVMwX9G9QV9kfJ42l3pdmX2RqhgmcBFZxF0VOoCzvMi9wr1sl089lVGZuCbaGtyneuoJIJALCBGZlVz1cQHsEChTM/lnnP+rdYfSgybu0HCj7xtB03zdp5uIEYv7xKZE1HKlbRKCDVB9K5INFqjMmU4WOjBsJRqPNpXR6YNv75ZX3/WMGn/F08wSW7q4gbYZGxdVJKXp/+iBPYNBtPUsje32ct+MWcEQVNlcyQMqXKGwVt+w== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zTi08W+luA0j3XWbuCp5/i/4seH/9UZnQveLLdlZdwtIwgYTMjtjTqjvJmG1EsHDQ0xqyOqyQE4dAwwAwntow8q2kdBNo+zox0bzmQPMW+9Vo/lhSfRJpgUf+k7+kVecydGTHAzsemihq5gtpqwI/alieoeUjJP13HPPfOf673AtM+Rg5veRPxCKu/6DQ1IDq2P+ueUGaDTzVRbrNX/RoadgJynVNMQr/OtrRg1RaqE0VOObgnP6Qkl8ddJI11vXNqaL24mUl9ff5ZIYKjHXZ4Ctc/M0OUzYNH3Zy+s9kwVUeuA5d1V6fn6AbW/4zk0bYY4WQEDRtObV711+PKSlzb0UMRmQeBBv8Z3nntEJHe9zySYhXDLWTSsyNx6uPmAUNRPI70CwTj4dyA1pvV0g8o1AtWXkGkUvFXbkZhUhN6GW5G1CZ6BQL80fPvdOeqke4Hl02Va/uE8qXxM9s5J6jD08PFxxQiVK5Cj8FEWW0N8wpg1w2MqUiRdWSK0l0YgcnkWLUBmA9ha5PJKx0jqLpuA3hKodJN+0ilJgd5ZNH/wgD/jRFNJkfWMVaslS4osBfj1UiqCGhz4KHOaQjqB19mU599ybC3DfG4kQJ+WgVdBpwjUCKBMqKdRylN2qidGNszwkVYDGG5pPRsP2ocUB3HMzxhqudj4B9R4p9oQAS6JZaRrOyob2U9YBrmpi+mQ3ZXGEhgX5h/bqROMKiHlWAehfco52zpdp7/5XZtfzcNxCuNh3UCgFTs2Fvlf8xOTK8fkupHL7HFQDa6JtiHiFI+KaKC21BbbPpUUxnMfDO24ZfMxjF5iliICaKI1GIUo6y8yYCsUKeabUB2rk7q+nATJy3sM95hlXcO4/WxjtLNv+6RQsD9yM2QQ2rHMkSslRr2IRyd4q0shwmowpwwBtDQM2ykW2JxvNKJhreEznghhVbbZ/Kpq9yT2YvZI7OctIFK9d76alnWip3s+GipYn5Pn+DaBWlf9KXvAgz76LsYKOGxZNSRe3cSdo0CpuD1U+uijWH+T3W4Obz3YioqzsFiwXEWWeVhT8e6cTIyTNiRoyKRZA0A5kiosqNJ9VXYwQl8cnHhyDe+VH+GFI83Kt2G3qBHPCC2Z97ObIkvV0knEkJXIcbzpA8qyo/1ztDGN6m/o/Vvd6a2HDLe6hZBcZ4yEVJjdXd3qoFjwRvkS/AQ68mQLviFnVB3MA/Io7XEVGWjDUm7SYYi2qUsF0LxHFnB447j5JBetf9IR1Paw8u3JFBLXjB1bBfQBUcNH39W1hRSylKHJjpWk2/cZtCsxp5Hv+54K603u9pPfHjZxCQSA= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5e288401-3be6-408e-b393-08da72d8d7e4 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jul 2022 09:41:28.9594 (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: VI1PR01MB4574 Subject: [FFmpeg-devel] [PATCH 3/4] configure: Add msmpeg4(dec|enc) subsystems 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5LHdTrByx+/p The msmpeg4 decoders/encoders share a common set of prerequisites, ergo it makes sense to use common subsystems for them. This also allows to remove the CONFIG_MSMPEG4_DECODER/ENCODER ad-hoc defines (which violated the CONFIG_ namespace). Signed-off-by: Andreas Rheinhardt --- configure | 24 ++++++++++++++---------- libavcodec/Makefile | 16 ++++------------ libavcodec/h263dec.c | 4 ++-- libavcodec/mpegvideo_enc.c | 8 ++++---- libavcodec/msmpeg4dec.h | 8 -------- libavcodec/msmpeg4enc.h | 6 ------ libavformat/protocols.c | 1 + 7 files changed, 25 insertions(+), 42 deletions(-) diff --git a/configure b/configure index ff075fb950..159d3574ef 100755 --- a/configure +++ b/configure @@ -2490,6 +2490,8 @@ CONFIG_EXTRA=" mpegvideo mpegvideodec mpegvideoenc + msmpeg4dec + msmpeg4enc mss34dsp pixblockdsp qpeldsp @@ -2744,6 +2746,8 @@ mpegaudiodsp_select="dct" mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp videodsp" mpegvideodec_select="mpegvideo mpeg_er" mpegvideoenc_select="aandcttables me_cmp mpegvideo pixblockdsp qpeldsp" +msmpeg4dec_select="h263_decoder" +msmpeg4enc_select="h263_encoder" vc1dsp_select="h264chroma qpeldsp startcode" rdft_select="fft" @@ -2893,11 +2897,11 @@ mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" msa1_decoder_select="mss34dsp" mscc_decoder_select="inflate_wrapper" -msmpeg4v1_decoder_select="h263_decoder" -msmpeg4v2_decoder_select="h263_decoder" -msmpeg4v2_encoder_select="h263_encoder" -msmpeg4v3_decoder_select="h263_decoder" -msmpeg4v3_encoder_select="h263_encoder" +msmpeg4v1_decoder_select="msmpeg4dec" +msmpeg4v2_decoder_select="msmpeg4dec" +msmpeg4v2_encoder_select="msmpeg4enc" +msmpeg4v3_decoder_select="msmpeg4dec" +msmpeg4v3_encoder_select="msmpeg4enc" mss2_decoder_select="mpegvideodec qpeldsp vc1_decoder" mts2_decoder_select="jpegtables mss34dsp" mv30_decoder_select="aandcttables blockdsp" @@ -2968,7 +2972,7 @@ utvideo_encoder_select="bswapdsp huffman llvidencdsp" vble_decoder_select="llviddsp" vbn_decoder_select="texturedsp" vbn_encoder_select="texturedspenc" -vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 mpegvideodec vc1dsp" +vc1_decoder_select="blockdsp h264qpel intrax8 mpegvideodec msmpeg4dec vc1dsp" vc1image_decoder_select="vc1_decoder" vorbis_decoder_select="mdct" vorbis_encoder_select="audio_frame_queue mdct" @@ -2990,10 +2994,10 @@ wmav1_encoder_select="mdct sinewin wma_freqs" wmav2_decoder_select="mdct sinewin wma_freqs" wmav2_encoder_select="mdct sinewin wma_freqs" wmavoice_decoder_select="lsp rdft dct mdct sinewin" -wmv1_decoder_select="h263_decoder" -wmv1_encoder_select="h263_encoder" -wmv2_decoder_select="blockdsp error_resilience h263_decoder idctdsp intrax8 videodsp wmv2dsp" -wmv2_encoder_select="h263_encoder wmv2dsp" +wmv1_decoder_select="msmpeg4dec" +wmv1_encoder_select="msmpeg4enc" +wmv2_decoder_select="blockdsp error_resilience idctdsp intrax8 msmpeg4dec videodsp wmv2dsp" +wmv2_encoder_select="msmpeg4enc wmv2dsp" wmv3_decoder_select="vc1_decoder" wmv3image_decoder_select="wmv3_decoder" xma1_decoder_select="wmapro_decoder" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a6311411d3..33b913c4fc 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -141,6 +141,8 @@ OBJS-$(CONFIG_MPEGVIDEODEC) += mpegvideo_dec.o mpegutils.o OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ motion_est.o ratecontrol.o \ mpegvideoencdsp.o +OBJS-$(CONFIG_MSMPEG4DEC) += msmpeg4dec.o msmpeg4.o msmpeg4data.o +OBJS-$(CONFIG_MSMPEG4DEC) += msmpeg4enc.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSS34DSP) += mss34dsp.o OBJS-$(CONFIG_PIXBLOCKDSP) += pixblockdsp.o OBJS-$(CONFIG_QPELDSP) += qpeldsp.o @@ -527,11 +529,6 @@ OBJS-$(CONFIG_MPEG4_V4L2M2M_ENCODER) += v4l2_m2m_enc.o OBJS-$(CONFIG_MPL2_DECODER) += mpl2dec.o ass.o OBJS-$(CONFIG_MSA1_DECODER) += mss3.o OBJS-$(CONFIG_MSCC_DECODER) += mscc.o -OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_MSMPEG4V3_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o OBJS-$(CONFIG_MSNSIREN_DECODER) += siren.o OBJS-$(CONFIG_MSP2_DECODER) += msp2dec.o OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o @@ -722,7 +719,6 @@ OBJS-$(CONFIG_VBN_ENCODER) += vbnenc.o OBJS-$(CONFIG_VBLE_DECODER) += vble.o OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o \ vc1_mc.o vc1_pred.o vc1.o vc1data.o \ - msmpeg4dec.o msmpeg4.o msmpeg4data.o \ wmv2data.o OBJS-$(CONFIG_VC1_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_VC1_MMAL_DECODER) += mmaldec.o @@ -776,12 +772,8 @@ OBJS-$(CONFIG_WMAV2_ENCODER) += wmaenc.o wma.o wma_common.o aactab.o OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \ celp_filters.o \ acelp_vectors.o acelp_filters.o -OBJS-$(CONFIG_WMV1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV1_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2data.o \ - msmpeg4dec.o msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2data.o \ - msmpeg4.o msmpeg4enc.o msmpeg4data.o +OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2data.o +OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2data.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o OBJS-$(CONFIG_WRAPPED_AVFRAME_DECODER) += wrapped_avframe.o OBJS-$(CONFIG_WRAPPED_AVFRAME_ENCODER) += wrapped_avframe.o diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index b4f9fa5022..8db0eccd89 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -502,7 +502,7 @@ retry: /* let's go :-) */ if (CONFIG_WMV2_DECODER && s->msmpeg4_version == 5) { ret = ff_wmv2_decode_picture_header(s); - } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) { + } else if (CONFIG_MSMPEG4DEC && s->msmpeg4_version) { ret = ff_msmpeg4_decode_picture_header(s); } else if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) { if (s->avctx->extradata_size && s->picture_number == 0) { @@ -666,7 +666,7 @@ retry: if (s->msmpeg4_version && s->msmpeg4_version < 4 && s->pict_type == AV_PICTURE_TYPE_I) - if (!CONFIG_MSMPEG4_DECODER || + if (!CONFIG_MSMPEG4DEC || ff_msmpeg4_decode_ext_header(s, buf_size) < 0) s->er.error_status_table[s->mb_num - 1] = ER_MB_ERROR; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 86a9b55078..bc41019408 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -852,7 +852,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) ff_mpeg1_encode_init(s); } else if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) { ff_h263_encode_init(s); - if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) + if (CONFIG_MSMPEG4ENC && s->msmpeg4_version) ff_msmpeg4_encode_init(s); } @@ -2372,7 +2372,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, case AV_CODEC_ID_MSMPEG4V2: case AV_CODEC_ID_MSMPEG4V3: case AV_CODEC_ID_WMV1: - if (CONFIG_MSMPEG4_ENCODER) + if (CONFIG_MSMPEG4ENC) ff_msmpeg4_encode_mb(s, s->block, motion_x, motion_y); break; case AV_CODEC_ID_WMV2: @@ -3381,7 +3381,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ } //not beautiful here but we must write it before flushing so it has to be here - if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == AV_PICTURE_TYPE_I) + if (CONFIG_MSMPEG4ENC && s->msmpeg4_version && s->msmpeg4_version<4 && s->pict_type == AV_PICTURE_TYPE_I) ff_msmpeg4_encode_ext_header(s); write_slice_end(s); @@ -3716,7 +3716,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) case FMT_H263: if (CONFIG_WMV2_ENCODER && s->codec_id == AV_CODEC_ID_WMV2) ff_wmv2_encode_picture_header(s, picture_number); - else if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) + else if (CONFIG_MSMPEG4ENC && s->msmpeg4_version) ff_msmpeg4_encode_picture_header(s, picture_number); else if (CONFIG_MPEG4_ENCODER && s->h263_pred) { ret = ff_mpeg4_encode_picture_header(s, picture_number); diff --git a/libavcodec/msmpeg4dec.h b/libavcodec/msmpeg4dec.h index af2591caf5..19b5c12c6c 100644 --- a/libavcodec/msmpeg4dec.h +++ b/libavcodec/msmpeg4dec.h @@ -22,7 +22,6 @@ #ifndef AVCODEC_MSMPEG4DEC_H #define AVCODEC_MSMPEG4DEC_H -#include "config.h" #include "avcodec.h" #include "mpegvideo.h" @@ -40,11 +39,4 @@ void ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr); int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, int n, int coded, const uint8_t *scan_table); -#define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \ - CONFIG_MSMPEG4V2_DECODER || \ - CONFIG_MSMPEG4V3_DECODER || \ - CONFIG_WMV1_DECODER || \ - CONFIG_WMV2_DECODER || \ - CONFIG_VC1_DECODER) - #endif diff --git a/libavcodec/msmpeg4enc.h b/libavcodec/msmpeg4enc.h index 98044913b1..602e60112d 100644 --- a/libavcodec/msmpeg4enc.h +++ b/libavcodec/msmpeg4enc.h @@ -22,7 +22,6 @@ #ifndef AVCODEC_MSMPEG4ENC_H #define AVCODEC_MSMPEG4ENC_H -#include "config.h" #include "mpegvideo.h" #include "put_bits.h" #include "rl.h" @@ -45,9 +44,4 @@ void ff_msmpeg4_encode_motion(MpegEncContext * s, int mx, int my); void ff_msmpeg4_code012(PutBitContext *pb, int n); -#define CONFIG_MSMPEG4_ENCODER (CONFIG_MSMPEG4V2_ENCODER || \ - CONFIG_MSMPEG4V3_ENCODER || \ - CONFIG_WMV1_ENCODER || \ - CONFIG_WMV2_ENCODER) - #endif diff --git a/libavformat/protocols.c b/libavformat/protocols.c index 6ee62a598a..8b7d1b940f 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -17,6 +17,7 @@ */ #include "libavutil/avstring.h" +#include "libavutil/log.h" #include "libavutil/mem.h" #include "url.h"