From patchwork Fri Apr 5 12:41:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 47817 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:24a8:b0:1a3:b6bb:3029 with SMTP id m40csp936094pzd; Fri, 5 Apr 2024 05:42:45 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbp9aZnXlZy5c5YQ+9JCUoXgv2pAqKCG1C5l9uSmhiAWjFEO2YtIAWFXXcBlQXrL7D1PCv0iBJsRiRfKnV6yUUUofO/8ImlJv6wA== X-Google-Smtp-Source: AGHT+IHmBhuQ3IpJZqerdvbsS/Rxc7A3dvSUxBHub1yFF1rd55U1q/PtZZvsoS175NFGyjwA+bR7 X-Received: by 2002:a17:906:240e:b0:a47:3afd:4739 with SMTP id z14-20020a170906240e00b00a473afd4739mr2071333eja.6.1712320965429; Fri, 05 Apr 2024 05:42:45 -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 xa24-20020a170907b9d800b00a46a6459f50si650052ejc.783.2024.04.05.05.42.45; Fri, 05 Apr 2024 05:42:45 -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=H6xJV7jB; 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 4CA0E68D13F; Fri, 5 Apr 2024 15:42:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2091.outbound.protection.outlook.com [40.92.91.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DCF768D06F for ; Fri, 5 Apr 2024 15:42:08 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R6YTlGrA55iE/pCRry75P7FFxPfKZu5PoDfErkHAdM5uJYGQrkF77+NkJ1TmnO10LD4icJk7rcfAYJ7Bq6p4jmqHDCzPpfNj9dGytttMJN+NWZ11ioQTMLvYtB4ZjC7DgjlpJYCqWkR4lwkzqq0Zd3fJEjLBugSzIdCKj5NDYzIIxddbbSDgEWfn2HV86mAPpwxS7ItkOuE477dlTdDFUm7V+w0KPE5ILNMgkFVnmr/Jy0tBdwVo8b1NL9tfIe1syTipfZqBInlhnsx/27OC+If/CvHrR+bQ3EDvTDGvkBEjVRXnwJ7j/V5/OFFLN2OngrncJLU2vJaz61p1Fm1h1w== 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=j3Zao5AlnJ2rkjE3UlUaBrcEHtXJcZkXSOHE0uvEnmQ=; b=KhQLjhB5nermw4lkeen13pgV7qoqhZwFuOYUmPwLR5weTF2dg96Znz4iUV8G/ZMnSedVBlIijFibooPemd0mgJCILLOD6cG2WvIxHzcJ+a095K10CywY0xeS1lz/acKIZIFcwp54g4HAcMEO2KnXV966wNBD7fUzAuJZeEPaNdHjTtnRTRVAfHd/OL5g+AjdZVA+CQL4zxhIBqVZaeqJ+WhaWRczGUnKE8Fwcja4fMBCiKhllFThb0ivna5599q1t82IbFtuzKC9xU04HvN4yoUuLEjsyswI7y0xnCdDTx/Xd12nW5BC76LlIcIw4hNUnKVw/ofqrMbMovqsaWq13w== 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=j3Zao5AlnJ2rkjE3UlUaBrcEHtXJcZkXSOHE0uvEnmQ=; b=H6xJV7jBuzwomxaA2f+kXclXCdaNHzQDSBUOdmJLYVSH7gfV1QE1tEBK6idqfc5BsFFCdO5a+hvEHtfCDL94ZA+Y0rhz+rgSD7f3zW78gGta1IHCVaieocRnaafuAevtV83TVZ/uIDWaSg8P8fJy0yVKdYleVpTBMTrV9B13w3yRYr84u3OXPpIs7XYK6RzOwnMQsow6a8QND/3Gkiqho2OtBXBGcDnujbAm2zH+gqWWNWSWXH0KuEivDIR3aDpja6ob6KAiIQflDXu2Jsd7dTq8TiBbHA850ocKQ7/6m11dbzykDd+JEj5o+3zww/8QM+Wgh1rZYs5dcHFL09qp6A== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.53; Fri, 5 Apr 2024 12:42:03 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.042; Fri, 5 Apr 2024 12:42:03 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Apr 2024 14:41:30 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [DW1fTe2J6oGnCcIk5vuXe7H1MZiKMMHGmn6Dj/UJwOU=] X-ClientProxiedBy: ZR2P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240405124138.2343725-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 40aa5f34-dde4-4f98-5916-08dc556dcb26 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0x3Vc+tONk7/Ola/ITG/grvxIdXLNklZRj1Xc+tefL+wUPiDa9DDGbWdC54aLGcZyBm6GlCLM7nJ7GguQvXmRYjMWf9+mOJQ50B4WMUjtVBpO795XF4I4oZLHn9UYmeh+mTaCfB/ykJfVQPehLW3LU5NQ+4a9h8n2X/YUe0WwpMfc9jFeelkfDIcpDD2OzXQqo9PA3BfPD80xC2Jhetq6WBgSM11MAovbk95TK3CqekEpT2Ig0/HsDbZrgQeX1ht1za2gRWooXIpof5Kwww0up6O5qm5Ei6p4Ak19wAqF/S+41sb1FjTzEQmuvLE0bcdB0TBg3zj26pgB4/cE4B63LtWbIPxqovfXjSclH4bW/VLpe7hcyfUywvTeVSYyjXmKdmKh+Jdu9cYSzA0GoPV8U/l3sM6T4d/sOOOiE51Gz6KsHGCsouKOAvwzoE2hUEzsVDzutqKHOkJaHPH7EhDNQgT7L4xWKRgHaUNSGq2vDgnBQTx8GLRxly0a9JaYoa7YIj56GDWfZnb9m0FpZKnxzkpJQ8bd2yz/M5Yz3OEesUJsOSjdmFPXIc95+d+zOCjSFcbWjRdkc4qrcEJq65nNVZch+QPnQabqc4SViD0o/MK6vCc+cxH1rn2VnQrFaRr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lLaDwDEKBOcSMYlF+zhbOtKDAaMC0uYSSnB4YmOvfoAikZjAICHKQaduCAyS6mdxeW5ptDYJM9I0aPHUcjVzds4AqDtg2U7gepusL/+IiOoLf20deq3SoSrko+ENQ/qc8cszw/0KTPX9qVMQkx5n/JvvaT2c5c88mPnFUwXB3W0liPqKFzyCGKO2D05sCHm8kS5mvCDQG/bDDOi+2luQ0KQ6VFvn+p21IJqQOGQMBj6Io/krkCprg70AT2+yXlV640EZ+wRjoITmH8hc7PGX+2P2wyY0g0uwHR+pwKhgp4Cvkwp4lKAI5l9YrTiLAWF1JPYEoHHFGdOs0bgfLgF24lRhmV04dU8aY0AFu3oUH1Q4tySPcDCdN6N9RhIC8R/7oztr2S8cM60LLjp2KX384QhTNQ0sRtHA8LIXLyZv08xOVTqdmg2kn10iEPrJ7TJpK3WzKPVUbccG0a0X76DLuGKUyBSNh0tcunrg2wCNUihEK6gI6M1YLSGNpSIZyliTg/Ch0o4QF1xKhpUJx0jBxr4o2lX1gakQ+oqSTB0W4SB6+bNz+Gi9fQPSxwevqv0XhI0oHobxiUDfvG6ZHoGtocR3YmsZgqvI20BCeILWmqse+HngrpgzR01VLh3NrSj/NeINPCOwTwZN5CZo+bEVVfSQvmixZMQnbj/AyFpVVywa0t/GR6yB1PdE7hzeE5LGHoYYDySb66mKN0sN8C0OyjL5LCQaXpy5oRn9ItbXQVesBTOnJniZzbXbbQV16xVbHZNqaqkDv3yR93ae+9xmLJGkq58HoukE2GhBWy5JcqZykM1zUnfVsdFd66minKyDvYGMS2I+31cfE+PD1hNX3emYe5C8zcjdb9mQAJKBKF9yksi+6pKdIXmX2dpRVHsTyg6LKU707QH5gUTBtWtMtcRgEBuRN17n1khdWIdR7orTnUnZUVB0BrL1TUsF1fJacY4NUiQ+eFCuctRPVbKDjAb34FiQiH7z4K8jQpr11JNQ6ojM+cILyHjb4x6nC9kb9E2YX58egc2WQMT0mBG6fSMcarKPsh+dsIoad2PoiD1+piWEaPX7envDldqkk+dE6yPS5Wvp2rCjcaZq+ZxhUTPFYAhowwKzvsBlH9LnUU24yTUPcWrXQNgfa6R7CiipTyIy1a1THSqVYd2kcZeiRTxpEosPZYLfCO+ltJ+OQt1MDFKEQ2T7C3G/GpY8KSH1QjkmEg4RVYElYNHGDatLXM4CyLcoHUEDg9rGkR7cd0ErZ+i6ed7armmUcZTkoUwUjsKtW2646H1OvlavTtqtjw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40aa5f34-dde4-4f98-5916-08dc556dcb26 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2024 12:42:03.0542 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 07/15] avcodec/mpegvideo_dec: Don't emit non-keyframe warning for H.261 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: o+WbigZGU7tu H.261 does not have keyframes (or indeed frame types) at all, so this warning is not warranted. Also remove an always-true check while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 1ced9a52ed..1059aa9825 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -380,7 +380,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) if (s->pict_type == AV_PICTURE_TYPE_B && s->next_picture_ptr && s->next_picture_ptr->f->buf[0]) av_log(avctx, AV_LOG_DEBUG, "allocating dummy last picture for B frame\n"); - else if (s->pict_type != AV_PICTURE_TYPE_I) + else if (s->codec_id != AV_CODEC_ID_H261) av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n");