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 3307546169 for ; Sun, 6 Aug 2023 23:06:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D97F68C732; Mon, 7 Aug 2023 02:06:22 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2054.outbound.protection.outlook.com [40.92.89.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 869B468C6E9 for ; Mon, 7 Aug 2023 02:06:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZsBdAnXQqjoXP9Dlm0Z4pyVkEQxdb1YtazT++waK4BoE1aiBMaC3qiwTzd2q2KXKA3h76YGtOeWXJ14vailroqIcYnv0MUmSBmjLTsbeC415KSjPKt6bqurc37RE7lKBxwcIGHi+T4drSHNlA9Ae2Eu0SO8lKHoLalgzLHNZSmfsYSmhq8E6qyPnMy8hGcj4vqRjciBLx6iLSR6A+91TFawU8td6PoW8/TTFWAy3hDIFOXxddMJdBCKB38hDUgCSTi43ONL7S2z7GsrjBRIqCW78TslA+M53Aw+7VO5/4CR8jqArKsuBcFXO5e15y65PLYFwOguVAntLKy6uK9AoBA== 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=2fiimG82mLESoB5XjKduLOvr3qIh5GGPdasbYf23XS0=; b=dOkuODPLtfLGkXaEzfmBp0TK50wYmD17ZhytQmP4Zz0M3vUn39fYH7F5Eeyye/dRrjMZxi07P3j5FCM/v28F3JDa3ysIxDfwxyMhMPMDdgD+iFZj/NXdG+2CgcvlLIzZdDyw8afsTm5uTf7VlWFUoQNBa+qGUOfD8oEEJ34vlPzZXfSpMj/TlubvOiAP4v9iXABmVi3c7+D2yqA2AqLna8CG6KZhMg8eqTwnWs0WIqRxw3MY0QMMlreL2Cuvfo0cWvPPW57TKN7LkzIFeLJe3GbDmL5CNpj7VWhKBF9vB37bkAI61IFZBT0Z0cwbdHuCk2E0v+dF0sodFNjsBoHv5Q== 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=2fiimG82mLESoB5XjKduLOvr3qIh5GGPdasbYf23XS0=; b=VWDFej3kgymgNQHwBzXaq11OFU8IhAz7r7Pb0UA1/Z1WphSdYGqJlS2CbtYH/MwgnzpsZqSXtWSBbaeqnummr/ra40V27Rc/i7bcV+4HdC7oVvTca2n4wfwoDkVagUQ39wh8TQ/STXhmOQEs3VaIqyOmj8yzwxyLviOpJx2wcUcWdCKvtu8edtaMKfCBitG9J5XPYzXiFpiKTyQcBXqEDvzCwWkgl6Du/tYr2jbPdOkFeiBMYFR0DbmQCtEInU0jrCIg7q6xiwz5GJJ0ZKs615At5FaVR8eVNG6AjARX0y54zc0rcPm35BW16f4J//VX2dbTrSOPVuKM1PhkvDkiMw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0022.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.47; Sun, 6 Aug 2023 23:06:15 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 23:06:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2023 01:06:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [FRpCLtyZJkmRv1l91ogXv1Z4afSY+qd5RmFdZllO/2Q=] X-ClientProxiedBy: ZR0P278CA0190.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806230627.3186387-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0022:EE_ X-MS-Office365-Filtering-Correlation-Id: f3366d2a-9ee4-4530-0446-08db96d1bc07 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHck60FqChmDUCV1zldfHkOCxTGJ6EjFYveMjJn1A0aYBCVgcJY7wOmgVNCGwWN/MLTGbBZEiDv7ox4ITdlr77110w8etrFq94TPRlAkDz9Kt6o3/vnTSIzQja1p9C9qOWNwgbY1zo1L6t3JIMdlg2u8xlhWu5lEAfF+U5v4tcl0WgL9EJm5td/oDLZ+NhImYpR+Og6whvF+Ud2MZ4cvG8ZXhBVzm2awPZQmzIYLOOeQmG8f59/+B+e1Wau3lkmPiKi7n5a+kOpkCvNe9s2NrYsvngMqFOX2qPVBkAefI9q9nvvBCc7ggQ5nRceYyoQFjgyAQFGqyaqhZl54k4zP2/sPX8o49zFGNXwrYIg32MrSSAu6CmEj6IQ2L/uyqbObqHuI2SHU5zyB1Y0kZcxlpYFxaFbB6lMClhhk8Ft2K012cpwvTbf7gWdEID1Y+DKKyvZdnWtUtPHAcolXGiZq806P24BY135/9VZq5BK8ekv8ssDmCo0rW/IMxSb1/VstMYpdAx1f1WUZbQU7m2MdrcJ8aNSjc1vv8P2MMH1M0cetL9zIs0Auqd4H+rnvpaHXKZO0vcL6ZZr2qqwFylajnAJfMUzr07PQaBSO5EFv/rlTQRDFoMkDNQ/UvS2Bg5L7YaZKRtpIl6bomGzNn1toBotpkIuXDsyTuemXdu/egd+f+nk3gZjYhdyT0VRHhD4pGcOztLKG3JG9wyG1EJuodG7ltTW4uSjNKW9W+rVwOOUKB/Kltn3v7K4w= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BzRnFFWmQubQkAxlCyZJn1JGXZO8OoLi6Mx5sqU5GqovV/iqNNVqJDD8FX2lbgvEVmLswVRnMMxrz2sIDvsTiUWUZt7/KZEfE9Y6osq90PvQE8/qwjMd2wN8BVwneuQrb+MEH68EoBmp43OXdp9TvQ9K6Lt8nj0A8THW7RTAZd7noZOc6w1vSGGVuicYYCBcby52BhHY7t1wyjGkXdHOaCM4h8ILtzjB9FxtvF7CNvBbPipXTsxPBY3r3dDyNQYetVkPVTpnNhdg1IxHqJB+8YdzYBXx0fGLE6sHz05irUBezeOy3KMj15a1ckouTyPNY0p0S9QNaJyi/WQ/41mmEiaYI8XhnVgmhA6BPhoNEIZTO8J4A07s3METBkARjrhqh2kNUgK9k/p3onn1uRRQtub97t0pEB/RX3TNSOCZDyWozeTHQC/YNd1DDzrtv2y1TqH9tfKkAKifLB7QgAXzCi2R2D7tcJg3/ZKwmbRBY7hD0c2og+NCtbENXn/dPMyTA91iJ1Em3qV99yoKjtQqyLM1zzN4hUqJ09tV1jWAyAx/c2MLg3cUP0CL0BuzlKK/Dr0AVsVRqgGHdqkaDsg+OFV1Ec6q3/+aZOiA3JIBsbuculE8DzA6Z+ehNPc9u81a X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?KLhuDew7VgaH+DSG4/27AHVMvNE8U9mXXNf8Bahw9yaFTDu2taep/bWgZCeG?= =?us-ascii?Q?Bh8BYQB96kIZIU4UpmVO13AgBB/JBbJdtnQ694XeGVOELpepkgVJfSfjgSSh?= =?us-ascii?Q?arYLr6WKKb6w/aRB6QyiytzSBIF+uve/5WEOShpRcKs6YTIO05lMiFIYyny4?= =?us-ascii?Q?3GwDvK2SUuYe3A3FX/ThPNn8tf1zysBA6ed7Da7nyb3U6v0EKaMwsg1HlD5d?= =?us-ascii?Q?C4GHfCvYc+vifbbh0CXqlbLhoYq3YMRBAf1QQXwYFmKCA6vUm/MAmE+GX5ve?= =?us-ascii?Q?HJjOnxlxGuGxvDcCpABAYZF4Vt78vrwLpbsl2q1WD6keiHtgE++JkMFrjA2W?= =?us-ascii?Q?3ahYAPdoDfoKswchR+79y8Vn8eDUF1sj41vZiBqJL6vf03d6sM4Q+zvYir7v?= =?us-ascii?Q?q9SOwQnMPRcBeD60hkvEX7NZXt+n1m5tTvqCQnFg0RYkuOJGLBCL0PIDok5e?= =?us-ascii?Q?ghKacBsvcgsAqHhHWhmJpqhWORmVZWfogddeJUJxwpMIDVNzaj4dbulVC+w/?= =?us-ascii?Q?fPQEwrEqash7F1F2Lb8KmJ3O6nVActvkwng18QJYyBgeP6A0KQUGNqaqkukb?= =?us-ascii?Q?fSCiEKxwqw4YH3sOrE/qRssHHCg+1bTC23wvK+PzLiSfi1hWj7v2QRAw7TKM?= =?us-ascii?Q?YJChbZ4upkQ7YlAds7fQje++jqbNweW6U9p1rAFyhC2JhLKVNXo1ZzRW27d+?= =?us-ascii?Q?vXUL0J0/bTPWZJhcknOshLm2t3o9IY7vRY0FvcFxcIFObGFq53jLV+Iwryrt?= =?us-ascii?Q?nbaUQyaRELdD9OwAeeK8Ev5yqfnJy1KsGhY2rx/odWLi1Fh+Mm3CJBF1fXmz?= =?us-ascii?Q?HMBiHaj4QD/NDaFzKT1lD3NyRoS/U6zUKjbL/ZY3IKMZLCuQzzGBmiqXfg0k?= =?us-ascii?Q?myBFpn8rTD1tn3Mieq/UWzvLo2D7+R70OLq+nmCYKx+N3fRya+NwKIwebRpy?= =?us-ascii?Q?pwh4iQr/2jBleafmTALWQWm/InEdZY3fNBDbg/cWhWFECAKzOJqAu2RWNwpC?= =?us-ascii?Q?H87nAYYRVYvcMMPEDVMZz4XoVs3qNz+Bojl4ZzWAJcXil/ffMFvBPJghecwr?= =?us-ascii?Q?/uXvai8jXefF6VJNMahVVLCc72RvFuNmxsmK7S3V4tCwnzTQ76bYszWNJENO?= =?us-ascii?Q?GkTe4jBs3Ke/vWV4LxvB2ghVVQdhzS4himwlSmbT5LQYMApmMxJcn1+cC3aN?= =?us-ascii?Q?zfkGA4uJ2k74Cug1JbAWm7KtbvnQBiNvOqIDGut1B9jk9By2OCvfS1ZD/qgO?= =?us-ascii?Q?MeFuqPJSgT7+f3T+JJti?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3366d2a-9ee4-4530-0446-08db96d1bc07 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 23:06:15.2355 (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: PR3P250MB0022 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/matroskaenc: Don't pretend to be able to mux RV30 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: The demuxer uses a extradata offset of 26, so we would need to recreate the missing 26 bytes somehow in the muxer, but we just don't. Remuxed files (like real/rv30.rm from the FATE-suite) don't work due to missing extradata. (The extradata offset also applies to RV40 and the extradata is indeed lost upon remuxing, yet remuxing real/spygames-2MB.rmvb works; our RV40 decoder does not use extradata at all.) Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a9b7f89f38..be70e7a6f1 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -3300,7 +3300,8 @@ static int mkv_init(struct AVFormatContext *s) s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RA_288 || s->streams[i]->codecpar->codec_id == AV_CODEC_ID_SIPR || s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV10 || - s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV20) { + s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV20 || + s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV30) { av_log(s, AV_LOG_ERROR, "The Matroska muxer does not yet support muxing %s\n", avcodec_get_name(s->streams[i]->codecpar->codec_id)); @@ -3430,11 +3431,6 @@ static const AVCodecTag additional_audio_tags[] = { { AV_CODEC_ID_NONE, 0xFFFFFFFF } }; -static const AVCodecTag additional_video_tags[] = { - { AV_CODEC_ID_RV30, 0xFFFFFFFF }, - { AV_CODEC_ID_NONE, 0xFFFFFFFF } -}; - static const AVCodecTag additional_subtitle_tags[] = { { AV_CODEC_ID_DVB_SUBTITLE, 0xFFFFFFFF }, { AV_CODEC_ID_DVD_SUBTITLE, 0xFFFFFFFF }, @@ -3506,7 +3502,7 @@ const FFOutputFormat ff_matroska_muxer = { AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, .p.codec_tag = (const AVCodecTag* const []){ ff_codec_bmp_tags, ff_codec_wav_tags, - additional_audio_tags, additional_video_tags, additional_subtitle_tags, 0 + additional_audio_tags, additional_subtitle_tags, 0 }, .p.subtitle_codec = AV_CODEC_ID_ASS, .query_codec = mkv_query_codec, -- 2.34.1 _______________________________________________ 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".