Message ID | GV1P250MB0737CEED88698F8261F28F3B8FE02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
---|---|
State | New |
Headers | show
Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp299066pzb; Sat, 11 May 2024 13:57:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW4GVQnfnJRxaIS69uXj8u+/7qqXdKgHfXnNRruIoHnN1lQJEbCk03dlJK132BsW5fsIU+ue4xz4rmr1FCxT62iZsEc4mgIrb7UFg== X-Google-Smtp-Source: AGHT+IEShmQt0ueSzAe9zKJO2JXpRhEIud+7Bq43UCu2z2kyTw77bkhNwyXf7Eu9iaDtD3ERY9PM X-Received: by 2002:a17:907:50e:b0:a59:a0b7:1850 with SMTP id a640c23a62f3a-a5a2d6871dfmr426211566b.5.1715461032659; Sat, 11 May 2024 13:57:12 -0700 (PDT) Return-Path: <ffmpeg-devel-bounces@ffmpeg.org> Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a5a17b36905si320848566b.447.2024.05.11.13.57.12; Sat, 11 May 2024 13:57:12 -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=OE2P5Aej; 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 EC69F68D6C4; Sat, 11 May 2024 23:54:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2047.outbound.protection.outlook.com [40.92.74.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11A1C68D6C4 for <ffmpeg-devel@ffmpeg.org>; Sat, 11 May 2024 23:54:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R2fMYRePQ3LB3aJFR9FGC6bunKj8v6xJSPehaxKMrh72KZiLAfi6sO8q1pEm8Siyb542f6xu7R6uzpgvTVYKXpole1sXYIIuX0bZKPuI4lASQj/eL283bwCTqqAcZ3jhtMZ03IVwVpI7fEeNicjWWYnVN3H59IxrT22t5eOumzSykYGvlwmZF5ZnaxmKbcmuIiA0UuWyJ/uwWTv/b9oB9FqSe+o6M86nHUI+jhjeywdjiuZArZlPf0sltuSOx5nHwJbFrXCbXUVLlocf/BdYj7BPG4Ce+JSa9CKsdrExzPp5r8z2snSj0+ubs7uS2qd2cA9FCmpe5KmO5v7TxJUdXQ== 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=dNe7gmbibJqHRrfN+04xnj4UOuQMdGo2zOpc8E5Whb0=; b=L0uRQwEQmvJTtZ57iaF5/d+L7MLTOslz+R3OSp2A5QWg9xFGiLfA2bWz8kA3Z+zvq0MTZMlAFFHtNv2hm/l/dXFB1gsETYG8jEVFhirCNC7ZqjbyhFBZvhFrV5e3mHmc5GoPcGEKIHMGOu/2WiZSrRVCM97FwI/NsOqLRz+7QP3ctcAGwWoK0pJcnqbA4+xmKJiP+blUlR5RK3mdqYBsX8Xru9rh+bVmNnMLJ12t+sKJvvGu53cK6VzmXSOj12Td3VoNAwAebOwW5lQBjN7y9axEF5XSBurbexGu+br41T9/AE/aRcf+NQW5dGfAwOFub32D1FwdeO5HBkognSOwiw== 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=dNe7gmbibJqHRrfN+04xnj4UOuQMdGo2zOpc8E5Whb0=; b=OE2P5AejAwOc09fc8kHpB17N4Psgb0q9q6AS4DZ8u0OILL1mMI54HCVQJ18MSNb87/TS+n8maATvhos/ssZSH5Fmw38Ybu31GVAshqZPuMrxoxMIqYLoiaVJuRoIPJOoMwH/sGeg8g9F70Qi3u1ak2plw/J4KAFRpOfO+NxPRLYk+grKN5IqABdd4eC0iUzGW0J+mSrwk+ODVGQ2ppUOjpnEw+Bve+KJ4z1qZzBdC+OiyVb6Oqk9ffSjciNuC7cbp57zanNALvVt/js0LikOzPUksUWrPcttu7tui4mDJL+VmOnmgicUGIfWE8Zk9/mxFebRQffY64b1bdDQfD1LVA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DB9P250MB0403.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:327::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.54; Sat, 11 May 2024 20:54:19 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:54:19 +0000 From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:01 +0200 Message-ID: <GV1P250MB0737CEED88698F8261F28F3B8FE02@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> X-Mailer: git-send-email 2.40.1 In-Reply-To: <AS8P250MB074471DDEA29072B2586F0EF8FE02@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> References: <AS8P250MB074471DDEA29072B2586F0EF8FE02@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> X-TMN: [MjeHDthZrVJHJWBs9VTJ7YkBF4N2SSZwEDpnU76cGpY=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-36-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DB9P250MB0403:EE_ X-MS-Office365-Filtering-Correlation-Id: 8818c181-a5af-4702-9119-08dc71fc872c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|56899024|1710799017; X-Microsoft-Antispam-Message-Info: fIu5wFy+KUtrEskj8z8tqxBl39qALeJucu8n/OiihnrIsz1sv7fB9L6nzfsVjvZN/WHP1qphnNCdbUBPugsCOWYjqERIAFBO4oJCslIj+MfE2nxT48zQOSQW4Bd/gUkD6FRw7/k3PfaWnrgQdkkrghR4Awism+isTOEnawHeSmiVcuDHFqo7eWYJobFzcnNceU9kwFVtkvd/myHMDUHRJwdmUgTccys3V53pjXo6eyxWNg9kLZEK5KNdPg2dEQdRcwaFGjxESVba6AQvtTDWJCBqEXD0pArj3uVkJqxOIPqiroaTrvmVh3ZCtgOOHrKQ/ve0bFWHzWLAkC09ACRUSfke7gfLfHYISTzwln3BQnW8s4KVyCOswsTLNS+4ZGN/S9pUBu2Wff2Q7HnqdCtI+wXl0/THd7s6UGv4tQ1LWvMD2PHe/6FGlYKQmbX1Y7RbXhCfsRYTUKnj/1nxSOXeBK2lG+zSAj5ACLfRLTZOWgkHqUz7EZNKMCmUlgB+1LI9wu4ys6Xuc33IjxRbkMtXRJAlyi2wLCzLUUKZ83tzxbL0qXf8Wl9Eo7J9+E3m02lXIUmHe3Q5iCBtsdJjeh2UZ0ZPDyOA1Cx+265Fh1BlLPkeEIcewAJ33JAk6M6zq2td X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vY9avJRMHxMVSqyXcZ1fi0VfLBWsu8v4XNmsFVxEQ3aDX3/5I6Yk6eaKHamFwn3yr+yx+EBhj6VUlc6Lp1LyntY+grBaWRrSfgrFtTQXXAjcx4BWUpiCaPWOf9Ph+lsUaDrrKVTHViU5P3MUHCVi2oWwMs7TQLXu9O94sVO8t/LQw10czUZgIF3TKrXWXtrvLNvirmWAUnl3JZfWmGEHE/fFlSaMo53v4soJeZcSOZbLuRkYP31H85404d/9w3WKyLjdpOurLWSVwcGDHGp4NVWzzgBowEUglAV2b+8vfjFTIJ5xhxUykoCuS3DXweI1mE75rwMCyE1KMBh04w/UJKkkRpy6jUvOT1qUWm1r7VBFO7EH96Ldxjp2gIXD6EQ/mWF1nSRQcfzUqxdNm9mqsOZI60DR6Z7E2T7ahBh8FjGCDaSt5iotJpXt6FYHGthY3r6/qp5gUDvFWkH7ucHlkWq79RAnQfgcPLi9uH/Ck00yYHJmyxiyDUXyjzDQfjIuCjBdXozQG0kIaW+Nkj96icAgI8880mNT4X7EJUV2jRYpIX20f9/PjN5lmE3swDmrKcQH6bHQgDZIcQ4zItFTicFDpmg410IdKcQpf2EW2LRAryNw0D+/CNY8vBi31/58osVhg4/MDlYo5MhvODFSkHi8HOpJkVDfUsvZJJTG6YFtVyxutbyljHhMQxUvflFayDE6rC+pq4EVpwRwW5Cvm5KiLDyeaY87qD/twz1bcrHF8JqJaARGf3gXcm5jbidT+AIJvdeZzwqrgls2e5yy4Zc/xR7zF6vfqAr4WXKe7RnZXjCvjx6Y9nO4cglz7ZZfmqJMM1KqaJElR+LVnTvrAkLgP/VnOeRQ+zc/V4v4JRcAPgAhHya3L0U86Jd36vPHido3iZIvhp92HTx6hR/+kZOZdAf+PK7zLxeHlSXNNYknexcRMnKvawql6+DbpcEFsJWuZZSs5hn1jzlZQMbQvNzpcOHXihpJVhE23PWmn59i7SaSCXvYeiu+cat9DhC7luFrC1AfThuBqH1kp+Lpjl4sl6n64GHecppAt7uz9wngHJHpKT+SQF6ehJY2YYHwOeolkGUGkXmSRsm9ZnyXHj6kWu1CA7w/fg8E790hv2lS36wqP5JFG4RY85CaX+owfEFnIloMvAQdE0Zs6D+gyF6TrSXs6cL+zumCJ+Mwmbg8fxRitYJ3zYsdHVFNLixiQLYiL+UzZEDMql+Lh9u/jvPmRuGRGwuEW7CVSc8J9txCE9vq655Vp37Ru3z3gjtDb3CNwslew3tv60fblUdNCQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8818c181-a5af-4702-9119-08dc71fc872c X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:54:19.5696 (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: DB9P250MB0403 Subject: [FFmpeg-devel] [PATCH v2 37/71] avcodec/mpegpicture: Improve error messages and code X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org> List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe> List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel> List-Post: <mailto:ffmpeg-devel@ffmpeg.org> List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help> List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>, <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe> Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org> X-TUID: Ft1qxKRQVGBp |
Series |
[FFmpeg-devel,v2,01/71] avcodec/ratecontrol: Fix double free on error
|
expand
|
diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index 6da9545b50..f605338845 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -102,20 +102,19 @@ static int handle_pic_linesizes(AVCodecContext *avctx, Picture *pic, if ((linesize && linesize != pic->f->linesize[0]) || (uvlinesize && uvlinesize != pic->f->linesize[1])) { - av_log(avctx, AV_LOG_ERROR, - "get_buffer() failed (stride changed: linesize=%d/%d uvlinesize=%d/%d)\n", + av_log(avctx, AV_LOG_ERROR, "Stride change unsupported: " + "linesize=%d/%d uvlinesize=%d/%d)\n", linesize, pic->f->linesize[0], uvlinesize, pic->f->linesize[1]); ff_mpeg_unref_picture(pic); - return -1; + return AVERROR_PATCHWELCOME; } if (av_pix_fmt_count_planes(pic->f->format) > 2 && pic->f->linesize[1] != pic->f->linesize[2]) { - av_log(avctx, AV_LOG_ERROR, - "get_buffer() failed (uv stride mismatch)\n"); + av_log(avctx, AV_LOG_ERROR, "uv stride mismatch unsupported\n"); ff_mpeg_unref_picture(pic); - return -1; + return AVERROR_PATCHWELCOME; } ret = ff_mpeg_framesize_alloc(avctx, me, sc,
Make it clear that this is not a failure of get_buffer/the user, but a deficit of mpegvideo. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mpegpicture.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)