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 9D7774B788 for ; Thu, 13 Jun 2024 02:17:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5A1B68D99A; Thu, 13 Jun 2024 05:17:20 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2048.outbound.protection.outlook.com [40.92.75.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B0D768D98E for ; Thu, 13 Jun 2024 05:17:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m9UlNY6KxQkTPHiXFr2VbAXwTYdES8KRhlcCk1l+f3QCFLUJTv5kV5MRRN86NSZs0ba69F0i0D6Mb7hRcu2s5UmAz0+Ix3nVo4A5a1GLD5a5bu7n0X97O8StWRskf6PFg/A0eE+bemoXezIWSXDTCwyHHg3KbCT56oxYS/5rXN2b4lxcxIz9m21lFXZGQBeQQC5C1Yc5WJpFhEopFbkLHvDlVTSoVFLtpVAhEGfc8s6JOY5rcnPbHDnS1+GwPeRRAfKwXxtgNpxB287+nGn8tssrv3+Bs/eWGqBT7iSVROMJ+1wr88CdivzYHHwWIJ32TZKgVQtLrnGyquMKu0hHwA== 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=4loZqNmQbATINrghz7GBiqQUDkD7CJOayC0yK7M+ZtQ=; b=YKCgE30r18+XZjrk4qXcWcAj/zzvAoxyV2TS3cveDh+fT/VH9XZsweGuOrRNHtmAmpKQABGQTrUsCNB4bu06w44tli+DlFwU4qilicid4aag1707aufIbUqj5IRLSILPnErzGVENTxJOBUF3yiv9eI2lLOys+M5au2Wq0m59kTWfz47mDK+MURhyKA6sQp+eSGoqsy24wjwRb34Xc+5aHYI3oAZXeNJBzMIzaXNcv2V/oMdFuAH3vDVzxa6T/9InXvl75tGwUioutok2VPy0V+VVlkloCwcOGSPkSGLt5lOneAvUMrcRDxZ6kCgxWxZruIPMkZvTYayryq+gGawLcw== 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=4loZqNmQbATINrghz7GBiqQUDkD7CJOayC0yK7M+ZtQ=; b=OkBwvGuEGUYaTJ+WFoY24/XJB/SWTpGPPDhEEOZ0jxihqZR9+igJq3uI7cD4DXMgBjVWK33X4r/PkHSEUz3xPI8d6aHzHFruVNoJS0FXyqdsdvht1TgsJBcdJf+ppyoNKR8nD8lniM+vgO1XSg6qgOhEu0bRx/B9v+970/5towSUvMrVHK2Mguzl2K+2+nr9dcHv79x2tg6SUyk/9mTOd7de8DnxQIWDJNcLd8eTkmhPMIuGuOm3ywso3n3J/5vS3CFifvTyL2l2AJi/LGtiFK8FXQuoezLHNxHOx8eN9jt3S9I3CseREJSG4BkTg6gnpoo+EaKnDMPwm+srTeW/2g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0101.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:370::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.36; Thu, 13 Jun 2024 02:03:01 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7677.019; Thu, 13 Jun 2024 02:03:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jun 2024 04:02:52 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [2KKLIAO05LoDvdgTG5+8Twgo26S8QS7r0n1jNuMHg+M=] X-ClientProxiedBy: ZR0P278CA0157.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::22) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240613020253.2277522-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0101:EE_ X-MS-Office365-Filtering-Correlation-Id: 37edfd94-760b-42ff-e06d-08dc8b4cf465 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199022|440099022|3412199019|1710799020; X-Microsoft-Antispam-Message-Info: fom8xmo7vf4YkapRk1IusaGl3l9X9Ytv4td6ZTdd/ZHcUeRo5DQl4QqXkdSxWjqGA+5z1ESwrkgggZ4HqG0MC6+4KUoaICA7x6z3IQAe8rV3173giaAInWRjY5JnGtdsUYUhMFzKcBa86mqJp1aVF8Aoqeq+faHigGr1PoHVEtjmLyR6Q5nfVAAqUYJFkIWEvOH/BoHSv4oikA/ctmI1miWobtzciBvv8NUWnGEjbDHLoJ/tyP8ZmJ/BLyC9AfH1qitAKz+aEx5IxVMWOGBNbUdNchxxqsES33ieaUVB1wtc5WO1DRM9aitfLlDbW3sAl37PeXibqQDckGeV0EgxIfpbUa38sEDdu0klvQsaiopZ+zS0/UCwRNNq0r1qv5mZZHhh1pCBTyCaXkW49bAyQ5eEOR1akqaVCaE2lG7EstDXlLyKsrDC2hI4oefCsUHVYti3yNE+E0JqKpS6dkoepvJ+f0nPHPUyK1kxv+nb861jGUObS0Zg2mcO79g6iJum67MjHzEzZWJz3wIfxtx/MDEdpOCasqDVGmLY4qTDa/IbFQlhea62ru3sxqAUEy+3p/92KRxyDWrQ2w4EMfrESMohgjHaBOgTgBLAcydzY8yWqqkc0mlCFpei93FV/gce X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LetHYXmH8Rn8TMCs4WgIQtxlBG5rB1eCzzxMIyh2CGkae872wB7K4N9eACFF?= =?us-ascii?Q?x96cgJUuuwgKRN63lySfSq/updKMl5i2yIAJJFCCRTYOx46Ij5N2rWc+l6ZO?= =?us-ascii?Q?EF1wg2ghgX19TIOrlpw/AFp97x/B+30m5bVBc7yn8zJ7NYCovToE0qZuZgi+?= =?us-ascii?Q?H1xXHvrbOL7i8kefYx9gEtlfqdhw0ceNuhzwAW3lZEyyHMyfKVWkYJqc5QND?= =?us-ascii?Q?V76HCVn898LikzPOtWbReXLG59K9MQu3flYY2HJ6xdufgV2I0D0p8fxNSkow?= =?us-ascii?Q?3TjpmSMXPpQbIGKpfSCAVVzFl0rRavPFUntHBvG72Er8KHiuqGuIr0Vz+KmA?= =?us-ascii?Q?hD9BFDlI+XvrYhJZ5758AaaACF9UUvd0651sgnxTRLXmxnyt09YOZ9vlfc9C?= =?us-ascii?Q?K/cMrJs0hhT1PicKuUg0CdZfs/lowzyuiE9yt2YMvz0MkejhGWwxIlS1IGlZ?= =?us-ascii?Q?hcuMqO16JaO1aQZM4TY80wyhBH2Q8yOHt3JGYqh7YshWQj4dPTz/nZGbn7qv?= =?us-ascii?Q?3wXQxuODIm24PZLt98tLwOaxhW+IWrixpjWX1nqu+LqS7tB8Any34MICXNlr?= =?us-ascii?Q?R7oeyzgtA537ooyxLaJ79G3NnSZjNTz5A51ddTBQC4OnRfkbWBgZooclHNsK?= =?us-ascii?Q?JLS1+QTb/P22J148RXKmQOON8E95ddekocf9QB2zTWmmS068GaYeb4XlhLMe?= =?us-ascii?Q?HijhlIPjNvHZbo8QvKSNrA9PpCkWj9f6jv4bs65RsTew25v1v6Dnue89oTPX?= =?us-ascii?Q?L9EfSX638oJ/caqlzScyqvWxcUSLmAy7Ffq8bWoRO6LvjRyukiNz1sxzBE71?= =?us-ascii?Q?KPEnZOXbwg4W1gmfdDf40Of0xn9D3faOZf1lsVgSIyd63qlgptAyJup2TWK/?= =?us-ascii?Q?Y7adOadAg31nitwHb+263oK2K/kbg7UjQ8gjcAviEWuP5UXhtSdGaWEgy2Pd?= =?us-ascii?Q?09eoYyxXCVF2rojYx/sQWYNL5Ey07H1BLzfNnA0dAttJZittzBcsMxqO8xi4?= =?us-ascii?Q?2BtPscrTDRfQU+6gIBlH2jHv1eic2yGiaskL8yqyQfMa6WR1IEvRB4RrDyNG?= =?us-ascii?Q?oMmv1e241rJoxqNDrDGiWGA5WziR45xM8Ihrkn6wFVWhkaI6vezGfhvYqVN6?= =?us-ascii?Q?OtHpKMYKp8L1C993UlLveFGVZ/Dg6OGBgMrKy/fvVfaplk476eU6xOJ+ar33?= =?us-ascii?Q?hFTg6Emu49NPqM7zCA1HSZfq0LvOQToPFvxEogYeRygpMv8nQuPAYhjo8SZd?= =?us-ascii?Q?nxP9k5RYMb1xDQGAA2p4e1ZnDbL06TdVRgrunXQZYQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37edfd94-760b-42ff-e06d-08dc8b4cf465 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jun 2024 02:03:01.5949 (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: AS8P250MB0101 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/mjpegdec: Fix av_frame_unref(NULL) 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 smv_frame is only allocated for the SMV decoder, yet it is unreferenced in the other decoders' flush functions, too. av_frame_unref(NULL) is not documented to be allowed, it just happens to work. Avoid it by using a dedicated flush function for SMV. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegdec.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 1481a7f285..ac2698a3c4 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2977,9 +2977,6 @@ static void decode_flush(AVCodecContext *avctx) { MJpegDecodeContext *s = avctx->priv_data; s->got_picture = 0; - - s->smv_next_frame = 0; - av_frame_unref(s->smv_frame); } #if CONFIG_MJPEG_DECODER @@ -3044,6 +3041,16 @@ const FFCodec ff_thp_decoder = { #endif #if CONFIG_SMVJPEG_DECODER +static av_cold void smv_flush(AVCodecContext *avctx) +{ + MJpegDecodeContext *s = avctx->priv_data; + + decode_flush(avctx); + + s->smv_next_frame = 0; + av_frame_unref(s->smv_frame); +} + // SMV JPEG just stacks several output frames into one JPEG picture // we handle that by setting up the cropping parameters appropriately static void smv_process_frame(AVCodecContext *avctx, AVFrame *frame) @@ -3112,7 +3119,7 @@ const FFCodec ff_smvjpeg_decoder = { .init = ff_mjpeg_decode_init, .close = ff_mjpeg_decode_end, FF_CODEC_RECEIVE_FRAME_CB(smvjpeg_receive_frame), - .flush = decode_flush, + .flush = smv_flush, .p.capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_EXPORTS_CROPPING | FF_CODEC_CAP_INIT_CLEANUP, -- 2.40.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".