From patchwork Mon Apr 11 23:49:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp1303499pzh; Mon, 11 Apr 2022 16:49:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxq9s+yXBzftRYwYUU4LggZeXHZj6G8gufRZT+55HjvsT12+UmBiPMxhzOrk8GCMd7V1S5A X-Received: by 2002:a05:6402:1a44:b0:41d:8969:e4c9 with SMTP id bf4-20020a0564021a4400b0041d8969e4c9mr3322791edb.299.1649720984174; Mon, 11 Apr 2022 16:49:44 -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 y20-20020a50e614000000b00418e91d3b3esi8074097edm.32.2022.04.11.16.49.35; Mon, 11 Apr 2022 16:49:44 -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=C93U+xNJ; 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 4297468B300; Tue, 12 Apr 2022 02:49:32 +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-am6eur05olkn2016.outbound.protection.outlook.com [40.92.91.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D4D968B092 for ; Tue, 12 Apr 2022 02:49:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cw8MkEGHE8GGXjiRT0gMnhKJlW8Z4zysi928C2VzTi5QJB6sa5eG9dFNso4KV7ustXPEHszo/3Set3UitMPxT3joYG/jntqmcGIf8tXsAZsF09YHosjxz/DzpKNb2tX8k+dOd4a3I0JXZK7rfdNVxFp5DVqXNG0r+pqYUN2Tw+Ytad0RdsfEZ/4B8p9ne70FCyzXgr1//yEka6tCjWgb00atTLuIM/v99vaHW382MFZFDCVCO8TR9lgnT/TFLQ1a62R9I1p4Mxs4FGlWra7/ewaFFHNNturUJzBnn+klB7TRk98u6VrFZt0wFC8Fop6CTkqP1i+dZxUI7fdffnBwQw== 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=3/yEXydjJcHZzm1EeOjnxRv+SR+UlamX5ZHhsYs7ltc=; b=MYYJwUsRwFjzCnh9tl0XUl7yaI3Eix4FURXR31O4FWTdwcPVmd4RNxF/TGWbCH6n9FacErpHlmBrLxL5OraGwHyFkf35tJmJLN116Mq6Q6PphzNEBj+8mheVklw8z4bEKVG2M9ye5KFv/Dcw3YkbspYzxCyWl7+JZybLnrVDA4eaxUGeYhuqiX81KsuZDyBnSbYp1f1FBL2YBD4S8kOrcIxAkpWctikE5cvyPmQKpvV916ydFF48KdWNAu+7bjFdgQ6J8nbo6b1IGj4HOyN/lHbp0d2nZyL7aNFXd7Kr8jfiCXudN+gDCrQjVmlV3mpz3x+8ZFJVa2bXF6nHrZ35hw== 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=3/yEXydjJcHZzm1EeOjnxRv+SR+UlamX5ZHhsYs7ltc=; b=C93U+xNJ3J4f+QATK4kM/E9AhO6jJamvnp1CaJRh1od9DKNIPz3cIgyV5cYAcyE285n34FQhDrg910Xv4OpgzMhgtQlw5OSNqE0BSHPg1yc0uOf6Au2QhsAK/kZv1y+/QcZoRNpfIYVgt9iebMlsBr21JGC6xOXtIcTlJ2zZUI982P5f8IkPJ2Md4TNqzw5e0VYIFPOf1wjB0BikGsfEZmsUTapeZ5JpYZbBlx52NgO2UR/Ks5i9SHoUGRoXsQQPquUBeo/6ow4WtynUFvb9LbLDe9jDhgjNa5aMrBbhW6j41JqlkbfJbgJ/VwYRPAQOQaoa23DeWJhthSNV3E+x3A== Received: from DU2PR01MB7950.eurprd01.prod.exchangelabs.com (2603:10a6:10:239::19) by DB9PR01MB9977.eurprd01.prod.exchangelabs.com (2603:10a6:10:300::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.19; Mon, 11 Apr 2022 23:49:24 +0000 Received: from DU2PR01MB7950.eurprd01.prod.exchangelabs.com ([fe80::bd41:5eb6:c582:c000]) by DU2PR01MB7950.eurprd01.prod.exchangelabs.com ([fe80::bd41:5eb6:c582:c000%7]) with mapi id 15.20.5144.030; Mon, 11 Apr 2022 23:49:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Apr 2022 01:49:12 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [+4TC/xI6PqLqXwJUxfGON9AFCwaH4AjH] X-ClientProxiedBy: ZR0P278CA0173.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::8) To DU2PR01MB7950.eurprd01.prod.exchangelabs.com (2603:10a6:10:239::19) X-Microsoft-Original-Message-ID: <20220411234915.316179-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d87d6e37-253b-4b59-e915-08da1c15e7fd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiThIBhrdRr4cDPWJ93ZpY+lmYrxY55l2kEzpr4xoZ6/DtmiiAfLahmAQNciWXD9HfcpFySLVnB4HsJayh+hR39baL9BKrmoJdz1d5AlRiQsA56nYLLaI8EVUqtng1ZnBECJ4NhPlVUv0tJuhGgNYwK9jmQnZ2m4h0ADXTmsiCiIVf8edB+5392Je1TMKwtFrG/UWtbeby+ZsaWedcR9D3LMMSBQYlewZJPgw4mHMge6NvK0dwest44yrW7irFX01blhTBK1mfpwoWKQYodsQWfm+JhjRcZfI6j2hcIuqLJ+BH10YEXCfjz3VHnRvAC4RNBOdUk2tqXK4r+NJZ8eLE4rmdzzO8yeTzbSCQ82pA+/nIlpJzXMKkyqBvoux5n9daDl7sFnAFjrgrPO2F4SW2mE9TcNqcyFOg5f909264nbVErhAJJG+RTYvPljQtsNEAh04Gd5VKamZa/U77b2xiWdmc7vgx5+kNV542zNZyKg+3l1jc4xRFt2Mc/phLOnUHfKPzdaqqYmvkrhpUus6VkCWTI0Hj0wBx0rdZXKkYFsZz9uPYd+YxR+iIQwN1OzNJFXObwWf/OutW8SphHPRX0QR7rRiNhCOY0lK2KnLScpKJpeorTbKWKiFfWPdpSf+OGiuLmK3DqCz73vY0wqEJB6zXJ0weTiSXRs0gcfZIdY8xvc954B9rZJ42PgxZEBrkG3ZGkkypYi20TqS0o8XN7B8CxgvPtro1w889/PFg+o3qat1T8g8kixnxYOAJXyVUk= X-MS-TrafficTypeDiagnostic: DB9PR01MB9977:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fJVnVAawf9OoUNO1NxxQZEvfJqjBvBNdSMsCmzIZv4hzFNq3BlumH520vrI4sLv8GPkf/mgSgv3YwOj3N+MBgWTll/2L1AGvV/+eOriSneiiWvEzsq5dJ6dqYHi29E5Ka1Iw26NyufH+xoHXiPlrawuZaezx/Mhb21KNLnGV6Io5fhfVlZddAJ42wMvXBKCdV7gGyYqo0l1MvehqU+RNOL6t53Ajp1gpvqQ/K3N+f8sSFgkEzHHQB3VAJ7QV0mqVFiB8lTZMs1UwvKc0MfQeBbgkXCfJFmyUsL98rT+lrh3n7w9eXTKLRHbEQhHdS+uNKJfibab11s+S1iM8uHx0bvbTuW6yb4Nyc1D8gIpPmXrJ7RVLydmd2JVzCwK/ZvjKvINCHJ7umlEPOXNuuHU2PR0CQk1DeL1cGl0CN7aFJkHjzjq18NF4wXp1t49SRmDSltEi3zzdtdEtMtNSmyUGpcj7+xZTeT/0JSY1wQ/xRvFy/djSLu1alsiyDlxqiT2z7rKfyTKzq8uWrHuMb4hokOiXaBwPafXWtgpV5UAtFon4g009AUTiFFjbn9UyzC2TpNcNPhoqWcMnkJgBo5TOFw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DewGmferMX/lyWKGoNDWlG6ifWTZcxrzjDz4bPClB+jhMtcx85s5DgzqZZpuNVBMPExz+OuqjUwFy2PlRhZPADf5Pze9bps7tYGihuMir0VqXJ44ReYlkeCSnJDMLkdZ1pdKb1yCH+BjhhPHvedRQ7BAQoRufFLohk6xF03BntyS5uMT2Ccn6j/RIanVjjpks+EP1SBzUkkku8QfQPeRdki1X/p3kYsiujr865G3gp+GCX4x/I0NlZT8vvR7DNfeKUXJMV8MVEy9yrGaL/c8ZLSK39oPFX5FlemQTVvHXf8dpneTphNLL/zSbk6Pf78R5FQy0HQeC+QeenC8m+QmlXzbwrAuMS0BfXOC/vAc6iO+JXE4mQZdV7LNE0yhBEj6wntZOI1sxqu2q1QEadc/WfwjMS0SthUqrB9w+TaZmk1CLt8Wu94y5PR7o7Dyu6aBohuhBnbKAKjbSfhunodn2/+kwYU1loCWUcUCHt/RRvqPKz/VBoT4ZJIL9HObOBg+OVYsC4LbnQM3CFsT7I/yue5vspvXfHgOaHJgHUaeL6peY2vsmjRAYb+h6xlaq1qVSCHKAQiqUtVp7lXcZNW8VuYIaqRvbg+IqcBAbE5MDVdhMEvFrCvXO7eT0u3rx/HpEp8o+8QUGPbMhMOCjafcQB57zwtzccr+tgvcyc1vvUfoWcH6QrWC/1AMA3BZN4PzwOPH0kODtT4JTf38wDVwLtp0lCsvfA/akIGBO52wFtWwzbipIG+6gg+5tAaGyxcnZbnT6anSBLezd8ztN2i/1gr78+jo4DDsN2NiPnFi8hgqIRubi0SzHJm64ngdM6l4OVl8Vw+KLJQ2I9P7Alryqj4dlOuUE4myvPkUQvHgp+fIJ1RZTLY0hfeVOnR/v9TSR/ZqsttlsKyesVdv4uV94x/zkQV2lRsZkEJ5qtgfeJuDEXF+dXfmGSRjJlDT+YOIyZRSKlLJRHm77HKGiJ6faEox0P2VpTeWtdG37do7XU54JJfDn2XDh9eIT5rHPf0Hob55Z8Ue5aZKxEHXH+ez72/KTub/5UooY2uTDpzV3Ium3DNUa8aMTe2R7QpCcdHqUo1IogD/qpAd3WKcC80a0x0RKAiUcCc8BVSuWhrwDrB0YmbOHXS3yiwlO9r3aZ1rD7Q0OOGp/qDNn5BEMUU6+iF/6yCbL5wDYZBtl5ZsnRxVokATD+31txenhdrK60FVxiI8hcUVBxIKjBkh+WICAkZmyZ51JMlCJF0Eqb4Q9iGWa8Y+RHhYSC9aGzIGPO3PkMo/NGQ+xIc5JRAjxxS4wtWy8/G6K7PFQmDbR8+mkykIRANVjoylPX4IEOEKDvsNvI8W+1cT2wqXvvqCLhnyM9Ycwuqqs+j2um7xWlNKwf9w4WgJG/oPHaUMZoIr9VX32j2TMjDc6yhARxUGZS11kgPM+dRCHj7tgG1UVJAm0+TFXqeU0J6q6sRkmYOHnoRx X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d87d6e37-253b-4b59-e915-08da1c15e7fd X-MS-Exchange-CrossTenant-AuthSource: DU2PR01MB7950.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2022 23:49:24.3101 (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: DB9PR01MB9977 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/mpegvideo_enc: Ignore ICC profile size when not MJPEG 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: RutBnuCumGaG MJPEG is the only mpegvideo-based encoder making use of it. Fixes linking failures in case mpegvideo_enc.c is compiled with AMV, LJPEG and MJPEG encoders disabled. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 40bcf09c0b..4a5e5a5059 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1687,8 +1687,11 @@ int ff_mpv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, size_t pkt_size = growing_buffer ? FFMAX(s->mb_width*s->mb_height*64+10000, avctx->internal->byte_buffer_size) - AV_INPUT_BUFFER_PADDING_SIZE : s->mb_width*s->mb_height*(MAX_MB_BYTES+100)+10000; - if ((ret = ff_mjpeg_add_icc_profile_size(avctx, s->new_picture, &pkt_size)) < 0) - return ret; + if (CONFIG_MJPEG_ENCODER && avctx->codec_id == AV_CODEC_ID_MJPEG) { + ret = ff_mjpeg_add_icc_profile_size(avctx, s->new_picture, &pkt_size); + if (ret < 0) + return ret; + } if ((ret = ff_alloc_packet(avctx, pkt, pkt_size)) < 0) return ret; if (s->mb_info) {