From patchwork Thu Apr 15 20:16:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26939 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7C07644ACE3 for ; Thu, 15 Apr 2021 23:17:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6494E68A67E; Thu, 15 Apr 2021 23:17:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-DB8-obe.outbound.protection.outlook.com (mail-db8eur06olkn2015.outbound.protection.outlook.com [40.92.51.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 06644689BB5 for ; Thu, 15 Apr 2021 23:17:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Gk5/8ibrhy31yhXKVLHpcS+D1QNovvjQUPVG0lSNGxTzk86h1ybUqatyWNchtpXQFoIfwLahinXzBJ3ck2w9qXSh9RhVz00Je0fsXeTS+D4vrjVxUOrxzx3JkgqS6zVz23KMhMc0avLuwI9HngSeF35iHa24/bsWIC65nWZDlYS9huQR/3AiB7Oe1i1DBvOfS/naUKs9dmLySSo1jjEFVjQExRpwWcEz66Vqq3VRW2CYNFkOKXvXc18/15BJP+HUVabsHF4MYuA638hmwvha7kOGqKqcMcxMIRaLyJDverWl/vsXuUw8x9pIY5Ti4K0gRfbpRhJ6Jkf4kzGi+HMqrg== 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-SenderADCheck; bh=tZGjfbCfkky73yZxJJsRfL29Y0ZNQztpQmTUGquaXYY=; b=Fw3ExVtabcLWo0aVhFBDN5P2TgdfzjrMf/PSZlAihAjnuJWr5jF6/K5Rbd09u62w7yOnA3zVRs+xu8SWiC7bIkCI/J8Qg7+AU7rIisVDuFDmCUc7tvXoTO/p7eGzlkkFMGBwjZXtRxQGOCxl+i+5/kxtRh+ahD8yAD81KI7inYKA2rqVcPtJ3Ts3003N99D6jYxVk69xzrKZvPXW2wbGZtEZcdMNOaQ2ZbQ5B6f8gMt7L02VvKGUTijYcoau9mbLo9oKN0ao6KmGzbUMyi5ujvJqKhrgnnTBK19CGUtUihxIy1wvE3r+mJL90y5fco4PWtWZPhXPva+hGDXfV9rKTw== 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=tZGjfbCfkky73yZxJJsRfL29Y0ZNQztpQmTUGquaXYY=; b=rcaHvTlmKwMJ9f/2ddx971nTGIfCiuIouon4jT4uIClc3VolY7Qje+9Ob+WPpbBtg42gvT28xdInME3n6WzbIGHR6zxeFw2twzfCPKWGbI3X7f9sgXumyVm38I4RjEXU+PDhYBLUS4ZzUHb0KP3kSB0L+b7yBd6aRDmbmiMxJk1QfDHT9cFNHS8XFZdd53kjWSoBKmBV+CLJV4KwzALgGS9UoaK/fKm7LCH3dYtWxwtT3v67P7ortusFWYn6omHL+qVIVcAtp0z0yngsasiQmK4SYTOjxLcLg/NJi/58Ita5mbyF/zfucsAz9dpxlsgCfXIqHvym7XlIR6+nS99s5g== Received: from AM7EUR06FT022.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::51) by AM7EUR06HT159.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc36::284) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Thu, 15 Apr 2021 20:17:38 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc36::53) by AM7EUR06FT022.mail.protection.outlook.com (2a01:111:e400:fc36::388) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Thu, 15 Apr 2021 20:17:38 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DF9408E8E1C5D7C61ECD9A498C1A48F423DFC5A25A1F51EC51BB6BB4C2248FF9; UpperCasedChecksum:9FC9F0BC44CB9247094090DF213B9295F571A4B451492D559A97B345A0B3EC50; SizeAsReceived:7586; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.018; Thu, 15 Apr 2021 20:17:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Apr 2021 22:16:55 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [Jj3JkBKTBBrBxSGfQDgLyOrpTTkjDU+j] X-ClientProxiedBy: AM4PR0501CA0060.eurprd05.prod.outlook.com (2603:10a6:200:68::28) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210415201659.1810798-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM4PR0501CA0060.eurprd05.prod.outlook.com (2603:10a6:200:68::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.18 via Frontend Transport; Thu, 15 Apr 2021 20:17:38 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 8bad0d8d-d586-4bfd-151f-08d9004b83fe X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXFKoSKZyiLYcPwGDHzH9eVZJqiEGGeC1aKfS5pngAj13OSGVD41IHY7rE8QP9N9hGgjAZm0GZKbmm3uQT9lfC4jd+IOAZu25JWmnp0XdMYcf+rHPeSGim/GHU1y1EmzEUUyulxN6WKOeWVrd6clU1M/GouUpRz3t6aA5BVdvwfTRSvcPP6IC4lamnmHPuejxFW3Jkw417lUMgGzwr/LnNP1WxNarAc9S49eRODIw+bGZqKbvFaajGLyq8BQl/fkMRtggbsSp6/GVbbQuM57BYJMEzjSBY3HLIECu5VXBvnSiTNUZg39K1511pwXTyWRAu5VDpFrNwihRtjS5BpQorwID+DOLYMZJ0x0FoKOaTJoB6or4KsMs06PmKr2adaCyPd351DAzgYsqy07Wh+3kt/nCPBNcReLXqdSZxmM/5GdkNGI999gbwpXQNSfI1g+FD+mUQm0JwnAHjZpZM67dLZ/c2e0mOMzLeaKWY5LSG/pjlx9Fj4RTSrki6TkzHW6Z92fWHSHdLVBfpLIgolJbffVaFL7y2Jy+uJteyS8gxBCrv1aIpq0ErRgg0g3/Vh5B2J7GSU8Du5v7pRLUvPwZ/8O0NZ8jh94r8gCj58vvxdvNq3t/8gaE4tSJgmRBWvcfUtn7nJm9ahQmW9FQZSMo/GkDt+CtHZF15ggXvNnGGkk7XU1vbR+RHgMS/voHXkVwhwQ3wsBBFDmYUV9G5Y/OiJpw5sRpXF/V0= X-MS-TrafficTypeDiagnostic: AM7EUR06HT159: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jrF39rtcSaAjU78hxcEpgB0yYegYwUFzo0o0lLSrhLuV6vAY8XnpFwnepHqM6DDxflQKKZi8soDO+p+4Z+8HMcRaYe+aRvjq/gaMSdPaFeGnVxjgLzNXcLzmT8edI5ztV3KZhBBcJ70fcQIVwsJL6HJY5NzCbFKLZ2SgM8c6Iv2mE40W2pD46fberPm/+ieHQEhKDINwzxruQA3uQoWwQ27cSkQJmaZZGOgqThGjLSl1upD2Hu/R/hi5Au/U77ECoWy2dVMjlRBd2Gg1YPgIvVzwgCVE4VfzJhasv/PIZcqDQEJ2yEWtGHwj8EugftwKKjQDF5gP3D4+eru83oMK1NUPx82AY9PeNbweHGcVSThtjMP+aFHA1DWTk85MERxx X-MS-Exchange-AntiSpam-MessageData: Oo0sFq/ZawayYVPyEbhD+yjZKGnCnkJ4ZMqWonUOXSfKJ9VNhvKt3c6QCrHviV7GLOumUdRnGy8FboNllV9UvnhnUkwi/egaLttThVg+3sXf3OHzMwa4C4IqK4dOsWeUa2T8A+gNEIc5zP31Uv1JDw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bad0d8d-d586-4bfd-151f-08d9004b83fe X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2021 20:17:38.8818 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM7EUR06FT022.eop-eur06.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7EUR06HT159 Subject: [FFmpeg-devel] [PATCH 06/10] avformat/aiffenc: Remove always-false check 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" write_header() already checks that there are only video tracks besides the one audio track. Signed-off-by: Andreas Rheinhardt --- libavformat/aiffenc.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 06e475cddb..1ecdb52ee7 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -210,9 +210,6 @@ static int aiff_write_packet(AVFormatContext *s, AVPacket *pkt) if (pkt->stream_index == aiff->audio_stream_idx) avio_write(pb, pkt->data, pkt->size); else { - if (s->streams[pkt->stream_index]->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) - return 0; - /* warn only once for each stream */ if (s->streams[pkt->stream_index]->nb_frames == 1) { av_log(s, AV_LOG_WARNING, "Got more than one picture in stream %d,"