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 45A9D4298B for ; Sat, 7 May 2022 11:35:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E65CF68B4D1; Sat, 7 May 2022 14:31:10 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2010.outbound.protection.outlook.com [40.92.89.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89E3A68B410 for ; Sat, 7 May 2022 14:31:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gvLARdKOVdNQXPPGS33vQx942WhHWL1QRrBJE+Je+vgd97W3mTKS4r2lOxq03Nr2CF1LG+Wlb7IP3qM/NWjDU33V86Ryq0+vh02tGM86qPi3XDquQY+tTtNT+3huRuq3tHmpvbm2R81mZmSl0tKp7q2l0Jp/itobFTDUi/KQffME0xhjcZK5S5X6foxJiXjlwgFf0BjjPxzg0MamHq8o3PS3T2iJ/0HWMTclVN4VM+ESHBqewVRO15zJla9txBGtg3FSdDHAFsNR/+xd38JRVf/RaowyTDYYaluTyCrEL3PFCidJFgbEOOsw6Dppc2iqs9xF3g4sDDj4d36HIlxxwA== 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=YquwZXEzCxOShO2XBUDf/PRqOAZ7kHcnWc68uoARNuE=; b=ltnAqWG4MEVruiWGe8WYr6s3daD720Ddin+kiVrHEbqFudqCzkJ2f4RjtiJAU1wFfcHpqXmwlU6Eg5m21tNqGHkoEDjs8EX/NHIP3Y/JEZfiMuXAcTB95xj+er1eVS3/BfZA2ETMxazqhXP9XwjZhmvLFGMh/xTaYX8DYGqugnXqrrTii5lprc3A4j+N1Dd92AApQS+VOkIdDkMqSnH30aPtjnOcDHEIqpqytDCqaEagKvh51ipFPopueiaBr35BtvE8D1BYIIdWAVnBVyzAbbCzfP8rmevVWL3/htB21wyu/gBrS9JuIVr0wm8XvPm04h0l+pxjJH/s8cU70ZBE2w== 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=YquwZXEzCxOShO2XBUDf/PRqOAZ7kHcnWc68uoARNuE=; b=DK209JEjLcpthOntRKFdtnb1fBuMPKeX/Zx+pwkbhfhPajRSVRHRGA3ou9SZzDRVL0CRNKF4gZFEM2lx0E9T4JD2NUzz0f1J/TEe46wocPxJAK+3//qZO5Ma7CMNL3s2l/9hujZgBCoICFBVETRW/JnqWBIsL9pLofTTnFjJsRTVd4T5H3iRt58mwUdZgFdrQYA4+prR/PKQhB7D92xFk/qg9IIAVHFV348Fey92S7uEHhcglzmd4ImPHhI4ZnMAfVfDrN74RjkihCzQLxXk8/d0oeQ/wdq3khyzkIaRctyZPJkQTC+hhkXvc1Iy0C9U1xztwJBoQWkwY/u3QZFW4g== Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) by AM6PR0102MB3128.eurprd01.prod.exchangelabs.com (2603:10a6:209:c::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Sat, 7 May 2022 11:31:02 +0000 Received: from AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431]) by AS8PR01MB7944.eurprd01.prod.exchangelabs.com ([fe80::1854:2c30:7ba1:c431%6]) with mapi id 15.20.5206.024; Sat, 7 May 2022 11:31:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 May 2022 13:28:23 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [rsUatRGyy8nqryF6MgXK3sccv9QqwYIq] X-ClientProxiedBy: ZRAP278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::14) To AS8PR01MB7944.eurprd01.prod.exchangelabs.com (2603:10a6:20b:373::5) X-Microsoft-Original-Message-ID: <20220507112830.406162-36-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0a170f36-e224-4564-1510-08da301d0ce5 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRIovyFjHwHllp74iOQFItwzu4V577dU65ed5eVZN41J6p4y2huotYlQDtCd2MxMaSOJOgFh+IRXYRnmZV46ELJlXmcmPSdDB//3bnqcN1zutQHf6wJVJCtaZG0oiSEK6u4dCPS80E+xN9le75w9Rkxcly5i+cl31sgsWyq+CPD9KIygaqR8LyXSmakCuJlNGY/Ao0HxuKm7nLXqKfx83gkWNg/YrlaCz1L/sVbNXmBk/VUSb82A2yoQxTmXBgK5mhwIo5SSKwkZp+mhxdmyccN+lry+jwwiVXrrGSzwLddi3C2lD/WDU/r093O9zWfWRBmFqC+/Bsxg7ib6GlWXkHUPAM8Chp7ilBx8VYst77RmMTFDTcwTQ9BsKQlm2oJn7XpJXmcds0vqHTM7fMBQHqf7IfVDgNEdBf7OygB32qAztboGxNwua2knIL5igTE5gOe2OeKsN+mqYMu1R7kkK/mWaVgI1nTwYD+GLHe2t8zR7C+IkYeyMc2UxNEZueYjVR3Isp3cDOUU2TaCxaBpeZpHFOGckwX6XDuuO2Bf+BzcCLswVjow7tDhckq/LtwFNBTTFtfLVQCPJYcwhvmUnuZWPkeQ1dEyVe3DUquefsbMSHcDsp1IFrrBEbjpt8ML9QQBWGRxYu+H2H9OjxGiua/0ATpWX6naZfMphaDrAJ+tS7qSgwcNdKWgA0vvfXwpNYu+fDJajvDi1zbpURReEgZle7aw4K+v8cEiqijrdV0Ma9J6TLWgxIe3se99kGBlew= X-MS-TrafficTypeDiagnostic: AM6PR0102MB3128:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AmbihqFEP/wyYFltP0R6z/0xS0yANdk10dBWH3IEbJTwMxeqV+rdXEXaBtuGvzfhCPYANA1CjPXKMG9RrnaS4gBVnMvEDGSO6QmM1+Dg8C5HQbzq3U18B7yWrulsghOyn0GbV326PU+VIlwSQTevkk0GJmDBhgkY+KiDs3r7IPIy+p2+FXw7TN0xLvBEpqAo+BLhMPSGxAWyZyykA0l9h7ytgXVm1ltBwu8Bb9r/UsH/o1726eqoa66YxyGaKRmICQVKgpoR7qchQWtieDo9+WBV8akC0bs0pIxsG/GZ/18RlpiqjAbMBDG6yjLQReriHsX787bErQ29KQHociLc1TasYvQt3p+8vVD3WJVbJyPiGghc2xBs0m3FUpVmFURd9HXXfq19ArZEYnQO6Fl34edxW0J668b/SgBkrCgwsqhqT6grzT3YOFA7ahXBHNc13bH/THUjlWGfxb1nFKze2Tg69MlfRYuBev65FMed9TjJpPwZfYquewsYzwtZAbZ/FpXhIxpO7xWLMldfu9rUCYX8vyNlrF4A5QWzkj9Etyl6+nGecVZLaV1QinKvKMhG8IE2o2wJEZRCISA6K9Dp2YuG0wxLAGzzP5cvaOVNY1NhXKQVsO+xbRx6BJ5q+p+f+NMjw6cQ9jxZmXZut705FYQDgeCkCXsi4/aDzHV0NHM= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9/t4iXf1NEBLw8KQU/bQculWVs9JBvetwrA2eCkBgZVq0PKymgzqTyYHH/7V?= =?us-ascii?Q?cl+jBBvEASwj3/8uMlMEAWIYa0Yvo5DhPtosk8YsjyYu96B3AeP2pMz8zRlF?= =?us-ascii?Q?Vx/PTzkMM60ZsuxqAIscPATvLHJ6XOFOgM1CDF21j5HhqC3oSH2/OqGWyHiC?= =?us-ascii?Q?ui5+RIoMQ504Kl4kDtibP4x+ksu3YYh1ahxLSZePCIPpf6O8onMsHyMNbznq?= =?us-ascii?Q?9de+Ieg/AQ05QlvRMZvPpSwhRL5z9hRurwEN2pSYov95H5gOdQ5sGuXcP2T2?= =?us-ascii?Q?deKV3xxNG8rs7svtyl5GgwRJ80mwAZG+ArJrK1sR1E+firdCobr59P2TH2Ik?= =?us-ascii?Q?Y5RMl4vcL3W48Vo+jvMmVa/H8MmoaqQUwRvyYEEl/nGWEh+36Y3ST8uVaWIW?= =?us-ascii?Q?vFRtcb8T4+tM5TLth33LIubzXdZWgUumE86LaQFZucqEu99SSzWecpLLUQTx?= =?us-ascii?Q?NfpzDuegikDP2jRS0hla5L+Wyla85MuzzIMJM8U7C7MKOSqNE7ET53Wqthfs?= =?us-ascii?Q?d11uNf8pQXOp0dD/8xa1m1hYN1iSl6JnYdJGE5KUwP1hgziN0mcR3Ht7o+Aa?= =?us-ascii?Q?f1oUseNVX5iQNNPiMLWrY2F65WyMAZ1y5j0B1b5mLI6JaCn4gyYaxly0sLFv?= =?us-ascii?Q?kN5rqJ8Zu8ONwVDbdXThPkZ63nFOEOHS6A2fLWxxLIibVli/qSpDAyJ+XX/N?= =?us-ascii?Q?EUY9RI+PLwjnPWK1cP64W01o72Oq8zVJgr80b7eiYS7m7rwNuU5bKmV4CM/H?= =?us-ascii?Q?iR7S0zqrsL/B86dwmJh3zmJnLgNof1xZwArXRsMv2C2WVB0cve6pKsuXYtky?= =?us-ascii?Q?eHy6RB16ghv6xYQjTEkCphTQlHwYs6cZTsjbxAeQBlDKz431cayIGutEq5wV?= =?us-ascii?Q?QGCHIl1PTddjtz6Hdsf1z9S9jZRCjn3EPPwQjW8cp6qEBzSi2XZK78IyJpI+?= =?us-ascii?Q?5ITFAEdUKmZMHYkI6MpnPRtS9XAi2riuy9jk7PlcZk2rwN1NEw7h0jkhboWw?= =?us-ascii?Q?SaElyt9zZDR2IwIOXDEsTq5bjtMHARd3I3vbLkOl+cCSyhAzG9cVOwknG9OJ?= =?us-ascii?Q?M+F8exb3nio07kKI3WhMiFUPBf+218QoYZw53EBtsuOhh6OFPoWALFdQJV5W?= =?us-ascii?Q?P10tAgwZzC2qMQY7qNSIPlmdqtvmBDcFStePuqzBKH08r35Z5DHzlq7Ike3a?= =?us-ascii?Q?IaNyc7sSPjgMFwKE4i+j064YE/Ts6RCQjEvHknUJU+K7N7xWSvCieUx/pyy4?= =?us-ascii?Q?BAydgcb+2fJTzQY0Qla6GI3JC5B0Q/sBgQJWKZZxPByhtDrebrkhh7PNfBAI?= =?us-ascii?Q?M1Ht1gee46Tj+YRk+x8W14i8NyNRFJhxVbC/eFzchnrD5sFcyUQ4lWcdiYlb?= =?us-ascii?Q?febo0Oq8IAZ3EVlmDumxwvSWcjmjw6MBa/RQpTRZ25ePTaBvdO4UhRCK4Hh0?= =?us-ascii?Q?g691T443jCbkK5MmyqWIRcOh6VVUCHSe?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a170f36-e224-4564-1510-08da301d0ce5 X-MS-Exchange-CrossTenant-AuthSource: AS8PR01MB7944.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2022 11:30:55.6745 (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: AM6PR0102MB3128 Subject: [FFmpeg-devel] [PATCH 37/44] avformat/asf: Move ASF GUIDs to a new file 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 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: They are also needed by the MMSH and MMST protocols and therefore the file they are in is pulled in when these protocols are enabled and used. By moving them to a separate file, linking statically to libavformat while only using AVIO no longer pulls in all the muxers/demuxers (and also no longer any AVCodecs when linking statically to libavcodec). Signed-off-by: Andreas Rheinhardt --- Getting rid of the rest for avio-only users was my actual aim with this patchset. After this patchset only two parts of lavc will be pulled in for an avio-only user of lavf: avpacket.c because of av_get/append_packet and ff_toupper4 because of ff_codec_get_id(). The former functions are declared in avformat.h, but are actually avio functions (they even use internals of avio), but they could be moved to a file of their own so that only users that actually use them get them. The latter could be solved by moving the AVCodecTag functions in utils.c into a file of their own. Yet I didn't do this, because ff_codec_get_tag is only used by muxers (whereas ff_codec_get_id is nearly only used by demuxers), so I am unsure if it should not actually be moved to mux_utils.c. libavformat/Makefile | 8 +-- libavformat/asf.c | 129 ------------------------------------------- libavformat/mmsh.c | 1 - 3 files changed, 4 insertions(+), 134 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 7fd6d099b9..3b9995a9d3 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -117,9 +117,9 @@ OBJS-$(CONFIG_ARGO_BRP_DEMUXER) += argo_brp.o argo_asf.o OBJS-$(CONFIG_ARGO_CVG_DEMUXER) += argo_cvg.o OBJS-$(CONFIG_ARGO_CVG_MUXER) += argo_cvg.o OBJS-$(CONFIG_ASF_DEMUXER) += asfdec_f.o asf.o asfcrypt.o \ - avlanguage.o + asf_tags.o avlanguage.o OBJS-$(CONFIG_ASF_O_DEMUXER) += asfdec_o.o asf.o asfcrypt.o \ - avlanguage.o + asf_tags.o avlanguage.o OBJS-$(CONFIG_ASF_MUXER) += asfenc.o asf.o avlanguage.o OBJS-$(CONFIG_ASS_DEMUXER) += assdec.o subtitles.o OBJS-$(CONFIG_ASS_MUXER) += assenc.o @@ -649,8 +649,8 @@ OBJS-$(CONFIG_HTTPPROXY_PROTOCOL) += http.o httpauth.o urldecode.o OBJS-$(CONFIG_HTTPS_PROTOCOL) += http.o httpauth.o urldecode.o OBJS-$(CONFIG_ICECAST_PROTOCOL) += icecast.o OBJS-$(CONFIG_MD5_PROTOCOL) += md5proto.o -OBJS-$(CONFIG_MMSH_PROTOCOL) += mmsh.o mms.o asf.o -OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o mms.o asf.o +OBJS-$(CONFIG_MMSH_PROTOCOL) += mmsh.o mms.o asf_tags.o +OBJS-$(CONFIG_MMST_PROTOCOL) += mmst.o mms.o asf_tags.o OBJS-$(CONFIG_PIPE_PROTOCOL) += file.o OBJS-$(CONFIG_PROMPEG_PROTOCOL) += prompeg.o OBJS-$(CONFIG_RTMP_PROTOCOL) += rtmpproto.o rtmpdigest.o rtmppkt.o diff --git a/libavformat/asf.c b/libavformat/asf.c index 6e3854eceb..1285062220 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -23,135 +23,6 @@ #include "id3v2.h" #include "internal.h" -const ff_asf_guid ff_asf_header = { - 0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C -}; - -const ff_asf_guid ff_asf_file_header = { - 0xA1, 0xDC, 0xAB, 0x8C, 0x47, 0xA9, 0xCF, 0x11, 0x8E, 0xE4, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 -}; - -const ff_asf_guid ff_asf_stream_header = { - 0x91, 0x07, 0xDC, 0xB7, 0xB7, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 -}; - -const ff_asf_guid ff_asf_ext_stream_header = { - 0xCB, 0xA5, 0xE6, 0x14, 0x72, 0xC6, 0x32, 0x43, 0x83, 0x99, 0xA9, 0x69, 0x52, 0x06, 0x5B, 0x5A -}; - -const ff_asf_guid ff_asf_audio_stream = { - 0x40, 0x9E, 0x69, 0xF8, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B -}; - -const ff_asf_guid ff_asf_audio_conceal_spread = { - 0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20 -}; - -const ff_asf_guid ff_asf_video_stream = { - 0xC0, 0xEF, 0x19, 0xBC, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B -}; - -const ff_asf_guid ff_asf_jfif_media = { - 0x00, 0xE1, 0x1B, 0xB6, 0x4E, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B -}; - -const ff_asf_guid ff_asf_video_conceal_none = { - 0x00, 0x57, 0xFB, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B -}; - -const ff_asf_guid ff_asf_command_stream = { - 0xC0, 0xCF, 0xDA, 0x59, 0xE6, 0x59, 0xD0, 0x11, 0xA3, 0xAC, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 -}; - -const ff_asf_guid ff_asf_comment_header = { - 0x33, 0x26, 0xb2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c -}; - -const ff_asf_guid ff_asf_codec_comment_header = { - 0x40, 0x52, 0xD1, 0x86, 0x1D, 0x31, 0xD0, 0x11, 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 -}; -const ff_asf_guid ff_asf_codec_comment1_header = { - 0x41, 0x52, 0xd1, 0x86, 0x1D, 0x31, 0xD0, 0x11, 0xa3, 0xa4, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6 -}; - -const ff_asf_guid ff_asf_data_header = { - 0x36, 0x26, 0xb2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c -}; - -const ff_asf_guid ff_asf_head1_guid = { - 0xb5, 0x03, 0xbf, 0x5f, 0x2E, 0xA9, 0xCF, 0x11, 0x8e, 0xe3, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65 -}; - -const ff_asf_guid ff_asf_head2_guid = { - 0x11, 0xd2, 0xd3, 0xab, 0xBA, 0xA9, 0xCF, 0x11, 0x8e, 0xe6, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65 -}; - -const ff_asf_guid ff_asf_extended_content_header = { - 0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50 -}; - -const ff_asf_guid ff_asf_simple_index_header = { - 0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB -}; - -const ff_asf_guid ff_asf_ext_stream_embed_stream_header = { - 0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43 -}; - -const ff_asf_guid ff_asf_ext_stream_audio_stream = { - 0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03 -}; - -const ff_asf_guid ff_asf_metadata_header = { - 0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca -}; - -const ff_asf_guid ff_asf_metadata_library_header = { - 0x94, 0x1c, 0x23, 0x44, 0x98, 0x94, 0xd1, 0x49, 0xa1, 0x41, 0x1d, 0x13, 0x4e, 0x45, 0x70, 0x54 -}; - -const ff_asf_guid ff_asf_marker_header = { - 0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 -}; - -const ff_asf_guid ff_asf_reserved_4 = { - 0x20, 0xdb, 0xfe, 0x4c, 0xf6, 0x75, 0xCF, 0x11, 0x9c, 0x0f, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb -}; - -/* I am not a number !!! This GUID is the one found on the PC used to - * generate the stream */ -const ff_asf_guid ff_asf_my_guid = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 -}; - -const ff_asf_guid ff_asf_language_guid = { - 0xa9, 0x46, 0x43, 0x7c, 0xe0, 0xef, 0xfc, 0x4b, 0xb2, 0x29, 0x39, 0x3e, 0xde, 0x41, 0x5c, 0x85 -}; - -const ff_asf_guid ff_asf_content_encryption = { - 0xfb, 0xb3, 0x11, 0x22, 0x23, 0xbd, 0xd2, 0x11, 0xb4, 0xb7, 0x00, 0xa0, 0xc9, 0x55, 0xfc, 0x6e -}; - -const ff_asf_guid ff_asf_ext_content_encryption = { - 0x14, 0xe6, 0x8a, 0x29, 0x22, 0x26, 0x17, 0x4c, 0xb9, 0x35, 0xda, 0xe0, 0x7e, 0xe9, 0x28, 0x9c -}; - -const ff_asf_guid ff_asf_digital_signature = { - 0xfc, 0xb3, 0x11, 0x22, 0x23, 0xbd, 0xd2, 0x11, 0xb4, 0xb7, 0x00, 0xa0, 0xc9, 0x55, 0xfc, 0x6e -}; - -const ff_asf_guid ff_asf_extended_stream_properties_object = { - 0xcb, 0xa5, 0xe6, 0x14, 0x72, 0xc6, 0x32, 0x43, 0x83, 0x99, 0xa9, 0x69, 0x52, 0x06, 0x5b, 0x5a -}; - -const ff_asf_guid ff_asf_group_mutual_exclusion_object = { - 0x40, 0x5a, 0x46, 0xd1, 0x79, 0x5a, 0x38, 0x43, 0xb7, 0x1b, 0xe3, 0x6b, 0x8f, 0xd6, 0xc2, 0x49 -}; - -const ff_asf_guid ff_asf_mutex_language = { - 0x00, 0x2a, 0xe2, 0xd6, 0xda, 0x35, 0xd1, 0x11, 0x90, 0x34, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xbe -}; - /* List of official tags at http://msdn.microsoft.com/en-us/library/dd743066(VS.85).aspx */ const AVMetadataConv ff_asf_metadata_conv[] = { { "WM/AlbumArtist", "album_artist" }, diff --git a/libavformat/mmsh.c b/libavformat/mmsh.c index 495d7fb73b..672f4b3788 100644 --- a/libavformat/mmsh.c +++ b/libavformat/mmsh.c @@ -31,7 +31,6 @@ #include "libavutil/opt.h" #include "internal.h" #include "mms.h" -#include "asf.h" #include "http.h" #include "url.h" -- 2.32.0 _______________________________________________ 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".