From patchwork Mon Oct 24 02:21:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38935 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1980941pzb; Sun, 23 Oct 2022 19:21:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Y1HzWo0gBoPJqLkfL/Lbo5PTFPASFose/M91o4aSnbHUeP1ZxUl06ZkuHia1znX6LIbM3 X-Received: by 2002:a17:907:3e85:b0:73d:60cc:5d06 with SMTP id hs5-20020a1709073e8500b0073d60cc5d06mr26296164ejc.722.1666578105561; Sun, 23 Oct 2022 19:21: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 h5-20020a0564020e0500b00460b26c8286si9947940edh.523.2022.10.23.19.21.44; Sun, 23 Oct 2022 19:21: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="l/AQCnMP"; 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 853DB68BC6C; Mon, 24 Oct 2022 05:21:41 +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-oln040092074084.outbound.protection.outlook.com [40.92.74.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2F3668BC94 for ; Mon, 24 Oct 2022 05:21:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eGA5zGo5OWpGuvKOzAbp8+LrmfMBCzUIp+bq8hWKAb5VZjdLPcHcIca8LzNaYUO0bW5jFa+6rbtcBvGIYOQsXIi92KEcJ/kJl4xXweDEioAhogYwGKmTyHD9NMG7NmP0wNylMraOQKJMc08mLyTt0G+Vk+qhA/yOqIdZzIqqDC29BkEYYLKXvgYuJcIGzmxW99kES87RYGixyMpUte+jjcLpy3S8Hl+Qb9caw644XaXdUN+voeVh/M7SqSwaGwDnCUlbc2ZYFrlbU0P15zE1E/5ZmYwW3gmS/riAejldyM2RNfIaq7A7AeDW7MqrPbpNWeCR+POaLdr3+dZrOfmWZQ== 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=hkR4YnwfckJhuZGI5mHJ0LcsG5wgmR2KZ7c8aNG5mLY=; b=IFdZtqLrx6w+cJdGQo3HOlyoUhp2D8lYR/BQrzKbbjjqB4rYtOi/IVCayw9hsbZCEVIjs5RZMfnfYZvKdS1C9VFEw+tsgnoyN58Ic4TC1Dxf4yrVsLpSE2BAB/XQ7EJbSidCMMjY7hsgfzDah7/j5L9/7gdFgpdFoh3B/XAujCIBR/IulrdU0bWZaq2jKWOoz0IoQko53Ocroz/Os0oCmurH3TBb3R5NuJ8uOPX+r34gvZFGH+MrxO8rPZiGo/gyvNcUkgc2nMLBbot9MC1Dq6i9rZYSpSgMm9S29aPN78mY6xi/udrA5FXE6EO1uWOwEXK0DSydYN12SHLW/THn1Q== 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=hkR4YnwfckJhuZGI5mHJ0LcsG5wgmR2KZ7c8aNG5mLY=; b=l/AQCnMPrxcs7GJZxkuRkw3xQYL/4WL6oXi1YEMFsEtOoEPM+FQvVdQ1E0KeCXhyHddNhzlKMX/ve3jzW+PeSpNrn/GZgW3LWWp96BIrESErN4iVWOh9rvcelcEUiUC0TYCs9ZA6LEERXdE4ruEkfqvqRDuEPrmqCxX271NX1ST6jKrCWt8mvofc+/kVvf9gjjaMePDmMxYKrwutlzEEBLMSml5G5Phtq+moXTBqBA44QfgD29Z/w+mxEui6Y1THxJubLCpcrMc3+5yf5JogIyOab8TQVKPDLoqR7X2PS5smab1w9eXFJm2toWFQjysZ5hYW1kf9nnHjO7LwTWxqIQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0081.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:170::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Mon, 24 Oct 2022 02:21:32 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 24 Oct 2022 02:21:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 04:21:36 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [i/oOXrQCJVOXCjhAEkxe1PQ0GZ1kvjwcUGJmOs7tscI=] X-ClientProxiedBy: FR0P281CA0077.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221024022137.1454362-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0081:EE_ X-MS-Office365-Filtering-Correlation-Id: f2d686aa-3b60-4d43-ff1e-08dab566779b X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mR3rcIqcGvj4Fme6n/uYkqevx2kB82dHn2+zE/oYy8zXs/E0XeZgSiDs0LV2uQmNxQsIMJ8YB2IgNM4dTsAaJOyoT7Vgn79tYzcqBEB8Haqwvdq9hCaIgjQ0ohN/SkFXUqSquDh3gPPQ724oGmefxzzGv9/LwTBX6CkviYhyqwkTjFN6PKRgPqSwkqreeQ8k3jyHymEdjTCKkXeeRE/QgMUznj8662xo0s+d0Zt8J7bONVYcQ4W5MBb+kSN3iB8YG+k9r8MIZwzmfFRuGsV75eMSJ8PFuZrQB2NImNqtMOD5UeIobV4JI0UhvFQdZToy2keFtdvxY7dqLXEYTFc5wN+r7Y2k8FSvGZKYhYLad7yJXkwvv+MoclTvbYbREJs+VU1eUBC5SJ7S8ycGr+2XedC6Vu0B/Hzw8DnqKq2Syl8K6jOd9LaAmaEfFb795Z5rmCAxEj35ZRSOOpra4XJGZgc323v4UqXf/HKB/4aKXisJJ6QuEFnWF49cmZYneXN2DKKBlyncM/bTPHfTZSOrEx2OGcMegujTupyWyzThYv/IBdXoQlElOP8+hFbfAIif6caggHA3/eZ+8tvagY/7yA7Dg9MFcPI+WDG3wHvlMz9cMBgvn3JmzAZgVlyTC7fkqdwVLBL+O5dy1knNY8tr4cgQAvvqiArWjr7mKYBgN/gi6oJ+wxY1W6R+RC6LXJbKjHCIiJQcRcY7DFr1iTFkeeMdE+JfqEgOcYkXydR2aVhoHpaxYQr7LbuEbVVo7Xu4aw7k58J8ObQooRyyU0KmRD X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: FnWYmD6l+evZkmW3IZbJdILZKPrmyQ2Q3BlWn7kr2wIBAovxPdYePM1/rVnaXNhyJuH7nLWvIhbT6e4XfZxz4EpqlcOHLt3VGzrGun3ALXmFZijLgBVENajlcm0rInGyQryVBlbEVyDuN5KA8PzjwJjiNfErWEj17+lSTp8mA99KidE/uLG9clfaNbVki68bgl3PYLHF/CKVkM6KIRWtGvuX+LABD1Su9D5dDAbIJ4PXBcQ4X/tcW/G0hTS0Ox3WlX4PoDK4kfqU5/XODskp4YlF4JySx4MLmB98pqihYjGL9jTLGOZr6Oq4BFbLXHxyBGhcHRZYQD5qGkakvQu735RWYbTHwEb9rzGWldOxh5+ddM7+Dd3eXuZ/Ea3Y9/SzZ0zx9yo9fYMAuW9pLgCFbzs0pvCeElcE8Rsyym594v/n/BRNhNH5IWWEtblbzLlNWXaYWyaXttXldqNY2uTVpETRTXcoVU4FuKa2hchI65V6oKIHf0El2jiUfbzZFey6YAIVpkNva+wO22Mp0qJjcxMiZ+i50oEzvyAo2WhfsCnOpmjgtM6eMWQPITZQykkRqSuk1asBqCCZj9OrrlwzQPdrdrW2KWH52gO2zVspKsYeSXmr+x7dbsaXqhF7gzkgkH1leomtztITYRMHygnlazuFa4SfKjgddAO4tc5/PDZGlMR11GxQchK83lxyhPk5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nkqxpCHN+3wacK1O24TuD4YR4DqSF4cSWvaNUdZDWRNh5RUmR7Ux4iHfujwo9pST5wWkajfOgozFEZjw3Fx4AF84NZ+EKZP8+2a8FIEJCSIPNQLQ2Dxs8poMDXiVYuWFZynVuuyZwtvJLoFY8g0BSDiUYLiM1RAmjQsTduhhsscRKXZH7HTTMo7nkND1ID9ZeTpUaZuqLEn9VHrkfBivP2j6f+HesT6m+IjF+wut1QK/R5RCX2z8afL/kvpf3Ysmo5IKyp3b/3hYzLRWLpJqINGELxVJg87zSXiqAzX3rAye/ojB7GlsX3u2r9ebYHlwfeAbJJv9MWtuIPljwLcFUzirOg4HbBAKM/iveBy0N1nI4GEXsbUs9RC2YTic+odrS1RKmGxahF1DYlssKN/Cil3McyvY0x4TzFXF6kwg2LEvid/VH/5tfJm4f4TPleIQVRhMiMwfhu10G7AzBpKj1A7NfW+EbDh+jyl8qm+pqZWK8shXKEjejTkARuERPt95a6abbN9xoz7MRZ8S0eIBYW++6Hv5RhCybXyJ2uejVS7KnQJ631H/DOUPee2/HAFy8Ax1WJGIros73f8JVyCsUmjKg3umT3vKIQm9oBW9fJMiPq1EVYOhDxfbv6Y/G5xfEetCCzNVrTp4JfGuh7aUnEvRFA1b68peDrw6IdX1gfVzBixpv820AcJDaOzw6vU75qmErX9P3mJb1DE8B+2PopZzb01/S+7zd3fhz0e+iKuufeb22BIAw1t5xhPk3+iUiVceiDHM/cYEY/1MAW6i5ZjgZhGTxQKnCkKQS8ZhIaXffhgwrzCGjaxexVq256xlqOvMSSpFelQuA24k6ew7Hin1CtVmQNZw/CO2PD2Ao/iMmZ4bQ2C4tsDE1igvg7ZqRs/CPUxBzCaEf37VN2Z4odAnvcZXeEIzOlrBTnU1ynlVY9n0PYY2i79IBNzV1hV8OsZW+BNprzQlU+b/EMS2q622O8Unwk7Sj1pyQ1jqq/+tPNge+40DeVY2drbq7Ea4lSznEHsssL/Cz6TlOg5pO/C5KToiQI9ghbHjD7zJkFTEEsB9WYI0biKm24j5/rQ6KImFMfz4Y9aFl7uTUhGkKRbZa3A80YzxxJhIpa7qNcUV2xyK9Z4Jm4EvlIbsPvQsHxFaokxH1oDM6xkOW+fqafOkDarCkbzh7eQEjnlr+lixNZQibAoO+drrdBLj7R8cfJMo6oyfo3Ha+HsjnMQqIuqRFO36HwMUbZ+QNl/IO2bWbcYLHNCHuE806prFJe4YtJyiFATEMpIef8l2m3b92Y/7q+ETrfQ6E7kPlNen4hdpWD1cvSsO6DLlpZJ0g9vI X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f2d686aa-3b60-4d43-ff1e-08dab566779b X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2022 02:21:32.6537 (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: PR3P250MB0081 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/mpegvideo: Don't initialize H264Chroma ctx unnecessarily 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: 3JXMouszzXr/ It is only used by the decoders' lowres code, so only initialize it for decoders. Signed-off-by: Andreas Rheinhardt --- configure | 4 ++-- libavcodec/mpegvideo.c | 1 - libavcodec/mpegvideo_dec.c | 3 +++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index eefd103414..dd207769a2 100755 --- a/configure +++ b/configure @@ -2754,8 +2754,8 @@ me_cmp_select="idctdsp" mpeg_er_select="error_resilience" mpegaudio_select="mpegaudiodsp mpegaudioheader" mpegaudiodsp_select="dct" -mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp videodsp" -mpegvideodec_select="mpegvideo mpeg_er" +mpegvideo_select="blockdsp hpeldsp idctdsp videodsp" +mpegvideodec_select="h264chroma mpegvideo mpeg_er" mpegvideoenc_select="aandcttables fdctdsp me_cmp mpegvideo pixblockdsp qpeldsp" msmpeg4dec_select="h263_decoder" msmpeg4enc_select="h263_encoder" diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index c436dc8001..697438fa6f 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -275,7 +275,6 @@ static void gray8(uint8_t *dst, const uint8_t *src, ptrdiff_t linesize, int h) static av_cold int dct_init(MpegEncContext *s) { ff_blockdsp_init(&s->bdsp); - ff_h264chroma_init(&s->h264chroma, 8); //for lowres ff_hpeldsp_init(&s->hdsp, s->avctx->flags); ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample); diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index c2d6d8bdd7..12c7144ffb 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -51,6 +51,8 @@ void ff_mpv_decode_init(MpegEncContext *s, AVCodecContext *avctx) /* convert fourcc to upper case */ s->codec_tag = ff_toupper4(avctx->codec_tag); + + ff_h264chroma_init(&s->h264chroma, 8); //for lowres } int ff_mpeg_update_thread_context(AVCodecContext *dst, @@ -83,6 +85,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, memset(s, 0, sizeof(*s)); s->avctx = dst; s->private_ctx = private_ctx; + memcpy(&s->h264chroma, &s1->h264chroma, sizeof(s->h264chroma)); return err; } } From patchwork Mon Oct 24 02:22:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38936 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp1981132pzb; Sun, 23 Oct 2022 19:22:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6k0WNDLT9vxW8Bv6oEkI50bAnGCcpXdsRUr/ROYtQUHDii1J9eLYT4aEKiK2sWsbsZYZex X-Received: by 2002:a17:907:3f95:b0:7a2:36c7:31bd with SMTP id hr21-20020a1709073f9500b007a236c731bdmr6857921ejc.353.1666578139860; Sun, 23 Oct 2022 19:22:19 -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 z22-20020a05640235d600b00458d43beac7si31528497edc.41.2022.10.23.19.22.19; Sun, 23 Oct 2022 19:22:19 -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=oZSTqPuP; 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 A2E3168BD1E; Mon, 24 Oct 2022 05:22:17 +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-oln040092074026.outbound.protection.outlook.com [40.92.74.26]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0129668BC4F for ; Mon, 24 Oct 2022 05:22:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fUGXrdZYwl466XSLeV1Ddk0GipWXSPROsEQDF7YsyNTCrNn592O9CQQ83oNHwOj7opVhx07ePObljMhcMzuN+vuqk+Jx+MBlnn0xpGeo4T3ND9Nv9KK8Dvpiu4HQfne5E/VbI0RIBlhYCpxgyny0XtPTGsVnXq55JuBraOsYD8O1JNg088QS5G2lhreO5jHo2ZNaoF55OY9SKXsMkTsTTBrUtQ/xKTtvdJrdgLGMJN/+YwvWdswiZFNV7RO4cKlK5/jcfVM4nfrH3JVjr+x1QhmTqLAFIMz4Ubuzf+iCMHP1O9906jSww9Dknf+1ItGAItmg5Bl3y1a5VGBv+VyA5g== 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=Lt73y3pICqRzLcwFleQgBwSZ2mgofJlXoVvIw2748JI=; b=CkCDrjWzFXNL0C4ZSWMxJ/wgexiNdiHdskeBYJcMZxmJ+84B+kCT72w+DtZX5XF6E2ow0W9UDQ57nmt7IdhLr/mTkbQN6yzBDpoRkHEjtBYjwzXY6LdOlGs+EVFvch2GJd27KBJr+YNBi0nL+LFnc+T5WwNinmkAHPVrXvjvIEjWZ4JTDJ+CNMLAHru+MDyi+CFhXo4LeoC2M2QZnr0zwaOwmMEmpZ4i3ZXMkpLd/dXeBCK1w553JFIR2AqErim4+tJJz3pVUkt4FF+iPebhAY2DkeS34i3sowuA+IA3H+9sgCoYRUIfAD8QXsbOMvJwpZ/ZRfZ3xmAK04QGhzOypQ== 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=Lt73y3pICqRzLcwFleQgBwSZ2mgofJlXoVvIw2748JI=; b=oZSTqPuPxIfZovFFvdSq0TOS4CnQkXQfEMu9P3AugQ+QFS+5SBUI4OnwE4exg0+UC3sVjTvXozv0zxTvsVcdMvhx18TXGWI1kblCM+/5mMOLYUFxggA7dCPTLbds2YdwIaOEP/sH4yzzYjB0OWB6vwpLZjlLeg6/Lr5JvVwkCOpw8K/eZXcY1qZHZ7DjfXW12rC1kQ0CpG7Ysx0FficZOVqBN+uPXCfsLecPrdykl4pk3mztRdrSWzlFU55rxB/GwNWIYx7g50UTeGtM6pMwvUuQ19rwHSJyGi8HTyZBQh4AZ93TLeMS4s/i/dfDaXu1osRCOVUQL/wKSsVm4eOStQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0081.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:170::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Mon, 24 Oct 2022 02:22:09 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 24 Oct 2022 02:22:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Oct 2022 04:22:14 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [QtGbbzbSfX8Db/aA4t/PRtmvGBa3TVe/o+1UCvyijd0=] X-ClientProxiedBy: FR3P281CA0005.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1d::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221024022214.1454789-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0081:EE_ X-MS-Office365-Filtering-Correlation-Id: 54058434-e1bf-452f-f2ec-08dab5668d40 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqH3kRfXJefTuhjP6Q2BkHIW655SPYzwNhc7PRsF+OYsP1UmSGeXPxrOrg4IFFQkKuU73CNzfaxRI1T/uzXLt0Eibibmc0p1U7fOsX5Cv6BEzdGbLD98GSCwLJVswKZlHdWXxwcu4CBrN6C4NXadiFfu7Qg+8TEPr0/vLySRQPZq9wPVs6Zt0Ykr6QQFFRtDk6KHjmMbkVMNUOUdJWnG8T9SqC62RuTgCJTB4tuYENTkf2bMe+LsNnEsb5t8xt2IdLCN44PNiRPloPzG+Atw6SMrro/jsjwxvv7lE3xf4yWpxqb8M134oOJuU2M+m3p1+J+X+u4latMJ/JKPPx0vHB81TFdRndvZSzzqKROZ7NHihgkcTPP2bzj2ICVOUpbX+DWor1Icl0nvpj/T7kl/s3Sy9bFRukebbNySQ+H+GCAk+LJZExNGAWSOAfbvyKAJxTjJ+/SqpDW5+mQ56ZkFclZSY8c5ZOThIN5uc2OSibjVMamysufa34gkgh+gfCfQ26+qa70Rxlw5oMq6VaYLbK1G/gDjEaR4Jzf64RbUG2gJJ7RGY1LX64B+HqGZRmJ4ORemlf4s+oLF73ja/88KakiDhK9CyAOrfNheBv0u6IgViENBP9h7F5Oql4fJgLaGjrZGccaMwc5xZ0FerpBuvnLgPuTUB3ygKKg7Kos7BwLQJrpXNJtFnkioez9syx3sHVUTA0TlgxK9slajl8i72TXOvTAaNIJkTmVqFj0OwlPXfIMIy46cfQXYb+dlX7i5tQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SpP0HZKTlsongqOlF4IuzCNwm6MGuFDFIsiFpAVNwwsj/WjkExA6NYQhMqf4sfBD5imWxy8ygmVRQcVdOkh1P9TLCUQIy+nXvdtt4yd0sfWTpmo/80FsSrADbZt92JhUQyr0EJ5J/UMK9fEUZhXVwA6Tz5+40pMqS7aQcgICigpHAURopGPIE5kU1iHdHMRr5gTqtxNuIWerk82drX5NBfWapvm9YSeNYS6wiiKC8QMJf1Db4xZfuhIHuc+H2Nj1HOQUTb+V/kqGKvyccXPAOUk44U3SYmXRPhqnknAAw5ngL9CWzpsZPOPPxLzErabiebf5ahZ8GzKv4tWk/fBfF0JI6z+bunrRI82nz5MFi1HlJ3gQIPwEaRyI2CnlfWhIbJo7rpfrQjCKv1w/zaqJkOfiqgEVjnLjScZKaV1qxniyEdG8m6hJTvcHh7NFyyKkw4obxlc++eMlmF9v0X6+B+rN6de++QkkIznkgwdC5nb3ExF4mDnYs4GB96yjlqnhnccacu+DFjfkVyXVsI1drcv6F1JBdnfWYV69R4UrSgufX4w/SMDkmvO5nIJFsoqIujVjysgk6PBZi4r9JUg34fmo1ERcZ1Ur8ReLzCuy67+jXSOw24oXObKaZkCrlWGA2bOI3jkgZ2ci8umbwDoTo2TsZgmI6eMrs3VV2sTC6CVHzC4eRd0f9bUdzO/FBYQm X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fyddzmrYb+WwSaCpGInZKAetLY0F/li/tIGrsIFgV+9NNTHKsJ4XCRe0sq8/3FycnTIzabfdnyIPQFxtpPTWBh55ptAWI4hfiSnH3/14GPrLsfiNjkg54SdEO83f8AK/T+Fg/XxxCce0aXAhXSmIsYw5md4JBV/qPkCZQUg2Ub2Vr4fTvAclpzJ1odW8QGgKeLr14jK5vB2S+DzeP8Uoi4sRDDCaMD9QGv4Ju3ubC6nnlWFK/Qzd3Kr7Y5pU9T5Hv9Muec8G/pbe9Gpvs7MGlGIWT5uh9lIXtzhF7YX2Md55eLgerZTJet99OC5RzhOSovPKzX/j6/q5q6eHKr5sNwdjLUvw3aIyuN3kXeaOV3xvmmpNqc/jXzIdgRmInMOcqNYNGKlWJIxLYmQWKVnUa8wf5rphrESlPDw4+Q/KvyZzoVqYFkGhELCeORDQva/edxT5grRV56zGW9EqEJUIb84Uvdpm3lxXWUAMTVROnk6TLXVL9uBmM0wkpgAZ2VCIzdQox27b94te735LWH+mqiP16bRmAj2xYDHxiWggGM5DgNn1rEm42BDXI+WyJeHETBa+0f3qb/jZN+jCF395LkEj8th4WkdSPrrSFSTGnVvWpLSq3SJSRuu1NLcwPXsDxTo6DuzgBQkWQ0Y5Q+7aBzdEQWiLHZEJfjB4HonfjVScUlqkWBmQY/ksrUZFSle8VK7alTEI0gGe5L4KPvTOPJr8W2bZzCz5qa58b6x+gTxqP0E1YUVkdAVDGH5CV3PIO9rcx+LbfEDpGXE4EYdlruZs8jERiQcUc92PhN+NBrSFQPC9vZY6DOyu7ZNNwLJhL0OhUgGYAv7sqxT0GDe2bimutB/+NmbVIRBEbwHCKwTcVRd4wyD5DNg88R/zb9n/NA3dRn+tUW4LI5po1fW1q1K/0yeWjgliygkEoIk8LBMMltKlQX357tLBVrtZE5/jr7hBx8GemuhSj8NGzVW4dcPe1I4bw5MgziJbAf7fZWa+gRLxlOt+RlJMpytvhVIc7768ITsvN/rROz12gi+Mw3idgVBOFfEvfIKKiUM8gtXHNkcqMc3qzdQAagps2er9o3Eexx2H3iHfQaTBixAPtlcwmA83rroImpkNeFHrBFUdpg52MbEGrpd4WspXRw2UNy9u+e3eib/x0Wa7EfGk26kO2Xb6jo+c+XJK0YIceOyGgxeLhb0cdBfqWfSUr6CUb/X/5C0UwtH4Bt3DyAOfq+ietxDxrFMuc4ETh2EF3iiHXOkHcepY0ymZeMGbkWOgJiyCcmXk7BLvEqN+fpbzY/+c861wZB58O3/FsIiHpa9Zj27YYVmtGgOarvOcQkpo X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 54058434-e1bf-452f-f2ec-08dab5668d40 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2022 02:22:08.9513 (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: PR3P250MB0081 Subject: [FFmpeg-devel] [PATCH 2/2] configure: Remove unnecessary mpeg[12]video_enc->h263dsp dependencies 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: 4z+JeGOpUihS This effectively reverts 9b78abae19aa18e8427848f4d4367da3822ed627. The underlying issue has been fixed properly in commit cff480e49d73640c980922626e57c9889bb4b18d. Signed-off-by: Andreas Rheinhardt --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index dd207769a2..cd339bc525 100755 --- a/configure +++ b/configure @@ -2899,9 +2899,9 @@ mpc7_decoder_select="bswapdsp mpegaudiodsp" mpc8_decoder_select="mpegaudiodsp" mpegvideo_decoder_select="mpegvideodec" mpeg1video_decoder_select="mpegvideodec" -mpeg1video_encoder_select="mpegvideoenc h263dsp" +mpeg1video_encoder_select="mpegvideoenc" mpeg2video_decoder_select="mpegvideodec" -mpeg2video_encoder_select="mpegvideoenc h263dsp" +mpeg2video_encoder_select="mpegvideoenc" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" msa1_decoder_select="mss34dsp" From patchwork Wed Oct 26 02:01:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39007 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp148573pzd; Tue, 25 Oct 2022 19:02:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5VazFPshNF6hTzseGVHc64RGIKatPNQGp8Ind37vsNL1JF6c65WQH1MuP/fsTjNjPEWKhR X-Received: by 2002:a17:907:9495:b0:78e:1bee:5919 with SMTP id dm21-20020a170907949500b0078e1bee5919mr34675412ejc.701.1666749740683; Tue, 25 Oct 2022 19:02:20 -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 eb6-20020a0564020d0600b0045db2dcff0esi5542945edb.594.2022.10.25.19.01.55; Tue, 25 Oct 2022 19:02:20 -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=TfblGnlr; 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 2D55068BC1A; Wed, 26 Oct 2022 05:01:52 +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-oln040092074089.outbound.protection.outlook.com [40.92.74.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3884F68B8CF for ; Wed, 26 Oct 2022 05:01:46 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UraGDXCdXAKw4qxiZI52JnVFpcg9ldyyiWfE32um+OnQC7g+OEhg9nQyLXVsfieUnncUXDn2BfEgPTbJcKE24e2AyfJ6JKlQJlABpMsESb7ksfiLC7numZDy2QaQkLPIX3q2nsip9rOutTGFvZbqd2teQfz9Brm0BpcARDKWV7vrKa5DsSWwESCa2hJwvf1vgzOdQKSJMV2hZxo/sgZImI3HhpgpTfWvzgIFmCXKw+fNFFwaF6MSUX4VzOKmS+V6TI8sq7eCEhqSY+okMHPs58cvHK2Ba4vUfAyGeAqb2YfqsBzV+cNi4GAFUGctLJFv52kflNbE1yFfQ6G1BKk/qQ== 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=vq078Oer6Za3EpEeWBrPiuQ0hSnt7mzjnIEdad2l0Rg=; b=BObFMQ3u3vbl/yFj+7NQGwxn7qMemBeF/gYz9ZHR5iXkbv6vGU+mfAxaI9V4xCsgaJHTpPbOO3o4/edTKmEY4lkEife29xEkoTBx2WKkBly4JxdDU8IBdWqaQEgpfHxI4pbJ4Gy23Jah4CUJKqPkuAqKgKQiXvbsSXX3EL4Kk22RAvWCmeSf4qbFr/fwCd9cqvw1eUcqmF18orKqB9Zji46zrbd/f4yioLYX8y3so5efV0jvw88ddmEYQFDIVezpDbZZjkam3s9myhAoNE+Sq8B3UcgmbMzGqbmCqPqqqYQTZnGnAQnXOHmebFv/oh0PFxH4j6liKhxQOuoOx6LVyA== 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=vq078Oer6Za3EpEeWBrPiuQ0hSnt7mzjnIEdad2l0Rg=; b=TfblGnlrlZr8IZcl9OswsIUqgWqqRz5bse3mEEKDiTyErRB3rEQZ6Bt8+wq808rvZxzcMefuxAKiiol8tzx90Glz69FgsM4tb0zXPeHgJsU7LMuAPBkOadQ3RT9LZKNO2wo+CTCKiiTRJXdIDQvRgTJ7Q8MJYI3M9j/ixsb5U7cXI42HoSw0DqeE0MqxhRwepIPJBk21KW3U989WzU9jwU9cBAk6qDi8YSVSQqXXbKQHqORYohqt5WoEiTaho6YUDIkg11qTf/UVu4FW3n8/iGyPLE4Fxl7kpBFzcIKf7nC4kUsCzoma9g87NuK9n7w2IqVC9TGsuLK0OmFJaaZsow== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0067.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:172::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Wed, 26 Oct 2022 02:01:43 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Wed, 26 Oct 2022 02:01:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Oct 2022 04:01:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [YPPy7eUZpQdFSUtqmk+MIyiHiPF3y3Xkbt31jwxDAVo=] X-ClientProxiedBy: FR0P281CA0133.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221026020148.1899997-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0067:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ee67293-b444-4485-fecb-08dab6f60786 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxxvavVV/M2lyxeQmb9yYopyfh0D+uRmq/X6GcnFqCS1nG4t/VbQHAupUrcyfHdqGj079LK1A6eLJZ8qcJrzaCTJNB38g8DYSnTQvnLyYAKoRfzvMU0zfJpuXRzrjby3cM/v3J1IOrRPkYhSAc2guGzd/9fSpcSGzpKWm8nJcXhKv6MPk4LknE+8t111DgmDEsG2ld2Sepq5dz86M1Wd4pe0E0jekoKMkBeLlKiyIyq3KMk7tX6hocp2E2R76RzADR6uufDk366uBwxaDleVwRe/ZnoWhbi7e5FTwiV2d2rGAJ633g2Qj/7lB/6dilOMESVWXUmJA9MIDis449KsptmLX9An7zahhJjLTd034FokAgXd1tN6rSRFWGedUqwOHxppomZHBgwc9bS0XtC/19LK0SdDgxGCX8fY3btsuYcfNAygQ0+niLcV/B7TU7KF5/59x/48Yg5mrzauTyyvJBWS/y2aR1etJMhDtk5XUTWAxl/FGgq0gKnpr4pqiKzCgNWUeys2GdX7h8Lq9JypbRH06GUl1gTkgtlx7hh06JyTjg41xr9TlyBKK0w0/9e9+cA0IIi1BzuKxSg3nkZCjrFBu2S7CYGuwP56ngez3iUsBMKmvCGRgOfj8bkbw9sphsBL1Vm7/GQ2t0N3Poug58jn4butS1J1Uj80CzKYWOMLRSbvJWwqsgePW42VHLiDIKAzXInbeZlfpUgveUkBWCIslVEBkuA5s8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SbLID5HC/VcBtSeb0J2SiTegM6GUSRV5mZ3EIqPaWcR7GYR0t8RUOUyv4RHcewAv1R/tTM3el9wiDluwgnt1ykwn8qHS/hKPRQ4Fja2bgNCLOq3oaAISiRWI7kHKPMmKQMmBVn2H8mUWpeU0AMijJkBtGf1mG7ya2kzV2hUlO98H2rMwCYKFYm/nwS/EOHPzpGB4XtdGF/H0WFzgeQjjvQuy4F3MAUcc0W+2ndWUMmC3TmlRjebXjrjctBW1qxoRGjiUiVd9ZkwT58a2qCKp/By+Oo9gjCsGHKjr2/fh16fxiIG9KmSUBPpIg9Zdc57EgmMvfaeZ96nHi8ULeoC3S2yjfqs3vRkkk5JJ/0HsP9aFX8cUtd213eLfpWmPg26dTOX8c+FGwWKfOKIkIe08c2WAq/2QUUSvfC+wa8zwhboBJeZ4P1DYOTKQ8IIn2Jquky7bFH7tHMoYpWoWdQskr6eKCJ+JB1uxpCiYuqrRrqsnjIXZzV+7raVMbI7O52mc27r5lwizc3ASmiiwCFFhTfIQWRuGl2DlCNEpaX0LEFHaUzOEvC/bv15PRAVEfpelr0gpOZI0dWca8M2uYMmRNYxJq7w2/iC6hgTwx9jT1ZpM/TF8gvJ9hDxts1BoZZOevpXeF2Z2qMjJvcIl6ys3YbyrhNUj15/mEIuIi+ZtSU4bUHAW35aqEoXmVWqBeCHd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c9/5xMBrcEQNpFkyRdjNE+qAcY6AvGV42JzrIDJVwfs1m8EZH5doco0qA/CEnEIjRGcCqoMWoUfJJLlNN6bI+lk/puuPe0oiF6DCiGFydVU8ghBy27l13sc8O5QWEZHZyqEQ1b4M3jaIbwm/OSzrV2W3m2Ut13tgnK6mz8UhktgNVM+61065fWGJWPDKP9ZitkIowOIJUhwhLbXI2GEqzN+uvTENsI/jq10Rt2IwRoEaq9q06h+UwqWl3rkmU4sawapRBeZy5+bFOjNWIuNFoShJAyJHizW9iDkYU6gI5hzkVp1GCt1fxGAJW/6lTYEAbfBjyFS8WgIsOxnDW+isptXvoLiXs/mQAbWNjPN7+xPPh1tmNbOG9+KPfnherWNppR7MeJW7ShVTtcua2FjYXZy/ZxZ50sZCcraNXUFomLdi81O8yOl1pIHuSQPR15Q6k41juH2Pb/MYlw3NgxtEmtvTH5kTK+iGOH6o/T6DJvBNr+2K0txEY05AwRr6v1IFhH9l3kSc2kaENBwQZ4a57eMffmg8576y1ueFtgZdIAv4cgJa5pGTwrxwzKbmzOW+LI6kiSlzt1QpO+iHxfQ+rvlOSkkI1NKg0rkQp2RA26q1ShHJxIFZHosh+fiRN3XPkCIYOjXo17VA0RO177OnGr3/U9Lcc9DKWfgUl6EyHSnY/yUAkdirpD9m0vZ2t9mEYjyFFFLPXi/H+ttaaCHZQFPs1G8wHeaBZtFxHI/XmmFQ9cR5EhtN34tiLr7HoMtaAdGhqYF0qnb++TlaxUKz1oY5wEKVzgXz6CnChliOrSb5aa+kph3zBaHonPugY8vJvLntaXhyr6dr/GQZwLb1AXLyO8+cqimShrxXO9KAIUlMdlwMGHLOWzZaJXVRCSntoeGGoI0EpfPYJicwPE1v90NnQSW+HUP04UfQjjnmGs2hQEoUevro86l0zG1qdTptgzATmFFq1wNDS7gomy5zksfeNsw997SxeAa23zo/j+DYrVevoaBFrfHX4cWMFZdOWLw4VohX7x5dGAXt1drv5ChvkNa8M6Hq9IuT7f2dotQnGIKseXu8wQjDNW/5kFyI6tgP1IYDDzPKWfk6gZwQTJZYBnghB+aBLvp+HaleiwKUR5iw/ABdmipED7w7tLGWWMOqBirPsfeyqjEeTMZnYaDMz5QWqhSfMTlL8Re8epTtYxs5KO8sIdR9L/YtnwZNTFEaaIKhkvMd917Xl/A0uqpeqkMiyEVhaNYi5DM+k2gKZ0bMNVfyP03wPfdGDgxU0FmB3awHjTl7SzrOW/rCCSHQypH/yH9Yu1THw3+UiWKl8WycrdkHb9zHD82ATjPh X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ee67293-b444-4485-fecb-08dab6f60786 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 02:01:43.3500 (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: PR3P250MB0067 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/mpegvideo: Don't overallocate buffer 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: 1kAwqj77yqLt Only encoders need two sets of int16_t [12][64] (one to save the current best state and one for the current working state); decoders need only one. This saves 1.5KiB per slice context for a decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 697438fa6f..0cd7c86ff6 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -382,7 +382,7 @@ static int init_duplicate_context(MpegEncContext *s) return AVERROR(ENOMEM); } } - if (!FF_ALLOCZ_TYPED_ARRAY(s->blocks, 2)) + if (!FF_ALLOCZ_TYPED_ARRAY(s->blocks, 1 + s->encoding)) return AVERROR(ENOMEM); s->block = s->blocks[0]; From patchwork Wed Oct 26 02:01:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39008 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp148599pzd; Tue, 25 Oct 2022 19:02:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6o8BIJU6W7UaYna9IohBVERfooPNmpHIUPCZqYz5wt510kU9DRG/MGCuLYqR1KzuaTQsYc X-Received: by 2002:a17:907:b1c:b0:797:983a:7d97 with SMTP id h28-20020a1709070b1c00b00797983a7d97mr27782174ejl.267.1666749741811; Tue, 25 Oct 2022 19:02:21 -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 v27-20020a170906181b00b0078d484e0e79si4120035eje.481.2022.10.25.19.02.07; Tue, 25 Oct 2022 19:02:21 -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="NfbZcTR/"; 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 4899868BC31; Wed, 26 Oct 2022 05:01:58 +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-oln040092074089.outbound.protection.outlook.com [40.92.74.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BCB768B8CF for ; Wed, 26 Oct 2022 05:01:51 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V38dmHVS+31IK2n+eev0dqISfNlNR0FjiwkKGM5867OIkDoBXDrWaqK28KeTqzkTzmxbvv8gxpPzcugN3OKR3VUus6zZDobLuoC8SmXH0o56ROXixmXnGZ/S50opCQonpqdi+pEV8DEQ9YeDBCOJ7TfhLc01Egmod4+moLwK2m5MXiCHcwOb9rnvU7BY6FqXJFVVh9JzED+KBIQ0na8Meqi5IUITx82J/S9avxU2buEi1YFLZ7tibtm/IHssyx1XC2FQ2+8XzeT/FIr1QlrmRmmKRD64kv93SxRD5iJ0axXDRNrufnjmXgAbZ9jafjQKLkbKlsM9z4KwoC1m88f2LA== 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=2BnPLsofp1Esqpco1d0BEDliBvikGZ/9PLCrOvr6ueg=; b=mh/FPV2WOQmVykziA7i/JPIqWCGuJ7iUd7fr6l60Z94YVJRF/MIA2dEznVm2kMbfqy57uJlqrAALAeLmsxLNs0AkjXfu3K6E3iSbZ8uoVDTMHI2tvci0+0ScaCidE6uARzenP+Bgv1KNAgprNYpq8FDmZzGof4+cm3vyI15RcKI0UjqKMfNeu9XluSFCdIxPuCW0MZVi9uvxVPotO4v2MPOs3HdU/waDzUeczN68vyST7X/yU8SapcuTAjnxxjoTpw1ZQ0Hu8+zrdx9DVQTR036uhplsYcmRPYfc0LAIGsMk0cJoG2xmHu+RCTPXBpJ3quA5OvUXD4O3unXayFMOjg== 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=2BnPLsofp1Esqpco1d0BEDliBvikGZ/9PLCrOvr6ueg=; b=NfbZcTR/Kl2r2TylnJNC8mbmJvkl2f/T7R5CKtXNOEimr1JFjDYMkRSaSggmOFl+827/FcixeyZT6LiAjxEJ+kFKc51e6KET0ekF9KzQOPhqHZJ5Koopc1+YQ30SxBla3AeWe69kgCeI3SOnp1zPX89ca135hggEr3BWr0uDCvwS0kWQCi92xgnYjUU8WCoky4zFP+1u4CJYbv70Gydk/8F8tavnBztRof+8jSKzDd3V881kufUmg/eaG8oR8kZTx1zAraFzQ0L4Tb/cF2TNIrlpiLdRd69ciY+TJ97bAbopvNeaejdNFNXoOxm0u1aw6rG6s0qndGEHmT6hej2E5A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0067.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:172::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Wed, 26 Oct 2022 02:01:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Wed, 26 Oct 2022 02:01:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Oct 2022 04:01:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [+sCjHAHUEefZJFPcmER/oB44pIdeJnHgRwfgUq0UtBQ=] X-ClientProxiedBy: FR0P281CA0133.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221026020148.1899997-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0067:EE_ X-MS-Office365-Filtering-Correlation-Id: da75a0bd-c716-435d-12ab-08dab6f60b29 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoSzhB4sgWW4MC2Y4ACp8EGBQcc2aJF7+0QOQNHAq5+W4nZ3mmAidointHxjRWs4TiVomsJYAHx8LZoXUpktAPJfk4cbWkFAlcEc34KvwYAuMBlOQB/eniQPI1MeWLGFMaUxO1d+m8cr6pUWQIs+VVLUIUfmalatuEGZKRg0jePQprnL1RzWMwAXbVq2yJl5aq/bTEuSE1WzExjFpcUcxoIn2AtYQIfPAhxxaWZKF0VVdVZHEanJ+IN6GeJ8LYzGr5v8ITf3fgQf4fsJzRJabhM6yvNBh5zDUUQIHZ2Ah/qw9J2Vz6VQsbJORGPr1KVb+WXr9ZgYCU9LxEIZbA8sfABFtDVC5EeMZDxxT/jkZAboYz9fihO0utV4N2MsvEF1tFZ//jx9wURMx35QlW1oyHjyuSpAD+keGZXFjzm6rtI2xcy2Lb71gs3GyyS5C/mneXrIYlTrF7vx0sVx1mw1CH42mcAaKjKGC6bzQgOQwMa9EIADQB123e8/79r/nKoNfb42uwEnc5d02fdwx6r40B4eKgGHCJja/L4UC0O2zFTRHEaSNcO19/OEcH3wnL/Few4lt6cuBaJ5kIBasad6HJ3wbpLtQJs3y5PB8IM32RNcG/VLzArWyKCtj+qk3tR4a5KGn2uJFFuUKg6lgxp2XomRCOqoWGE1K3potbUW+6pIPvL0uv0L51BVGU8fiP6yYMB7sLbnakfNnh7lnMUoE99sFjY1OkUQTCmWU/DxItNIt9tFhzt9kjWf6uSq0n1b4c= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hJ5WKG23SRDO7rmib6c5q5TjeZtP0wjZrxnqVXtLqC4vQCcg85Xv6a+htGDYEMkHaHRkG9Vw3lDkpyBd8WBhlAPonxAiHvZ/olKjhsuMJcC5Kpixy6cfceA192/EWhHPpnc9orX4JFZd/Jrq1Oil0hRiQrd9HwIBOqDOth5xJUBRQFZm7ctsBxpjDlFGtNcb71PGCnii6FfZDTv20GwPeY/1NIOfr6Fzpa8C+5uwfi2vVxkg0EMuc18e0n/iO2enLl8fO+dxWWJh9ZwOVbOl+9EPiJQxxJzGZ8RpA2YarJo1fXr6vhK1Yp+mRPnBU7MqRs1NDmdKIC4IVAslXUpDus4GBNrIK4LIC6AK/LczgfSd4H0vw0pHwEfD74GB+EdyFXJVKr+eTKQhWyE+7FYu0fzpMH808asWGcfAk88l/YkFaKEcqztjcsvnIth/oOl4YFr6GieN1aRMc+DTHBMR00VbQGTMNeGCRSX2omtcJn+9IWPvtAWTDv7q14N1njZpEcGKfC3MilJYw8pERTVh5cTy6KyE3b3M464sbgERFU9fMF1OZUfJmaI33WO2LS5mxgxB4PiEK2MOP3H3iGoSo3LYFgp7Rg4hE6zcttkrAz6HSJcD68xJZcxg1P6ZVNgqJuLYDAs6h+dPsNw+j29Hv6bWdQ4gbfQGxI7WWsLahoBUowlfeqYaUaApUKow/O4x X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UKrWx5FUaYw6VKTx8WxKBizK4izE+BPlv2/DPAFn+WWB4R+wZQ4kONUILKwsj9cA0SWQgXem5o1cK4zujb+M2sTWxfZQYlMMO5no429szLc0nKlO7m9EVM75wCO7PZIEpuv7ELb8T5zpxDUsrTNkaUrs3NaYRLhdX1hfRrsYqcKMJY0jr+vlYLxilAnVHLm7Zk614+p0RwqTtBnJoMQnM0xUm1HT7KMykUNn1eEGfOYav0N9C2hzLbidIsyorHtfSQwMQnUCsv9PmDlYRJpU7UpUpQgzLoHRKLcvaOCEz14PZAsiGClPKv7JrDazXGAhYVMQk/hf3cko4U3xa/2bQh3cmB/g8F5xavqCnnhZhYb99s51Azl7fvSHf/7EvwVOfN4kYUL9W/Db+73rO12sRIzbMqZ2/Em0Ylcz0DzNig/l2dNUvCXEm3KWkRMAhuWL0x18NdXyoKZA/thS/taUXJol9/6ILSdYwWnUCZhT5DQiPtzDcRpsqYrXrjuXfllTuhQn2W+vRN3L43+b/+shiwhJWZiQrGAfDLo5vlihh3lWTLIMScreVQzwW6XvqUv/p9rmyFA4mLjWXeDoh5ApilTKPjKXXe4szLIFoS8rii3nO4GSX55U7/aDBnU3E1NBdPYGJ2WUtgbV+FbNllaKx/5mCl7dsMfESpyhvr58TYTw4tg08fnn99VlsLSjJ5fc42DpUOH4nIzmwE/KmMKPygSzUTivzsSejbUJaBLK02oF0pbdd7ie1wI/Yb7ZQB2KaK6EJ0lHKIWUj6RlPmjJh7TWmGQux84w8SNnFaDHCUVQXmDxz02MuM/VCSNwO7EgdKS2YW/s6TVWdxQ+/SD7xc23GU15dxXIRPl85knWOIhMlKTP5gDrTn7uNdzm/9g1yawS94pziePseTNFfRuklPSwWilZ4Uci3xgo2RKKekCDQokMscvYZiF7q/bhPmX5WByGHR6TAWRv5LKH0q7tT3SboRTtXiSRbjJ9eftov7v9mNOU9FWS6AWXIT025jNFnEyP7daZfYU5xSVMRtMEBFnoF4Pyxx0D38/y2waXVChDR+EtiFS2vB8Vf8xhBo0VCVa14mJohoLB7czFdgrDQ7dSFi/2iwa1WXGeXux4SDiMf4WCdtBoOo9LJDuHpntuNfHiBne4dYDw1xFQszokfKJFQ0WZ3mfJnL5hLHllvZX5HjHqcZC4tHEABbI0+jPvehJKxbmOmIuSQc45M3A77UFC3BcinNKnokPaDDAFIECyJYKLSnI0+3fGdN7Yk0qp9f4173QBfHXFaW9OVcpgRVX4DAMRV2dtedHYgY5sZQ3lOTCLJeqiGPf7xz1ScTH+ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: da75a0bd-c716-435d-12ab-08dab6f60b29 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 02:01:49.3359 (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: PR3P250MB0067 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/mpegvideo: Allocate map and score_map buffers jointly 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: H3cyuykklnF5 Reduces the amounts of allocs, frees and allocation checks. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 7 ++++--- libavcodec/snow.c | 1 - libavcodec/snowenc.c | 6 +++--- libavcodec/svq1enc.c | 8 +++----- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 0cd7c86ff6..a04d519ccc 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -373,9 +373,10 @@ static int init_duplicate_context(MpegEncContext *s) yc_size += 2*s->b8_stride + 2*s->mb_stride; if (s->encoding) { - if (!FF_ALLOCZ_TYPED_ARRAY(s->me.map, ME_MAP_SIZE) || - !FF_ALLOCZ_TYPED_ARRAY(s->me.score_map, ME_MAP_SIZE)) + s->me.map = av_mallocz(2 * ME_MAP_SIZE * sizeof(*s->me.map)); + if (!s->me.map) return AVERROR(ENOMEM); + s->me.score_map = s->me.map + ME_MAP_SIZE; if (s->noise_reduction) { if (!FF_ALLOCZ_TYPED_ARRAY(s->dct_error_sum, 2)) @@ -445,7 +446,7 @@ static void free_duplicate_context(MpegEncContext *s) av_freep(&s->dct_error_sum); av_freep(&s->me.map); - av_freep(&s->me.score_map); + s->me.score_map = NULL; av_freep(&s->blocks); av_freep(&s->ac_val_base); s->block = NULL; diff --git a/libavcodec/snow.c b/libavcodec/snow.c index cde09902c3..b6c8d5e256 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -635,7 +635,6 @@ av_cold void ff_snow_common_end(SnowContext *s) s->m.me.temp= NULL; av_freep(&s->m.me.scratchpad); av_freep(&s->m.me.map); - av_freep(&s->m.me.score_map); av_freep(&s->m.sc.obmc_scratchpad); av_freep(&s->block); diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index ada24f7895..7fad95b69a 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -82,11 +82,11 @@ static av_cold int encode_init(AVCodecContext *avctx) s->m.me.temp = s->m.me.scratchpad = av_calloc(avctx->width + 64, 2*16*2*sizeof(uint8_t)); - s->m.me.map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t)); - s->m.me.score_map = av_mallocz(ME_MAP_SIZE*sizeof(uint32_t)); s->m.sc.obmc_scratchpad= av_mallocz(MB_SIZE*MB_SIZE*12*sizeof(uint32_t)); - if (!s->m.me.scratchpad || !s->m.me.map || !s->m.me.score_map || !s->m.sc.obmc_scratchpad) + s->m.me.map = av_mallocz(2 * ME_MAP_SIZE * sizeof(*s->m.me.map)); + if (!s->m.me.scratchpad || !s->m.me.map || !s->m.sc.obmc_scratchpad) return AVERROR(ENOMEM); + s->m.me.score_map = s->m.me.map + ME_MAP_SIZE; ff_h263_encode_init(&s->m); //mv_penalty diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index 7c9430a137..92f91aeebd 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -552,7 +552,6 @@ static av_cold int svq1_encode_end(AVCodecContext *avctx) av_freep(&s->m.me.scratchpad); av_freep(&s->m.me.map); - av_freep(&s->m.me.score_map); av_freep(&s->mb_type); av_freep(&s->dummy); av_freep(&s->scratchbuf); @@ -608,18 +607,17 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx) s->m.me.temp = s->m.me.scratchpad = av_mallocz((avctx->width + 64) * 2 * 16 * 2 * sizeof(uint8_t)); - s->m.me.map = av_mallocz(ME_MAP_SIZE * sizeof(uint32_t)); - s->m.me.score_map = av_mallocz(ME_MAP_SIZE * sizeof(uint32_t)); s->mb_type = av_mallocz((s->y_block_width + 1) * s->y_block_height * sizeof(int16_t)); s->dummy = av_mallocz((s->y_block_width + 1) * s->y_block_height * sizeof(int32_t)); + s->m.me.map = av_mallocz(2 * ME_MAP_SIZE * sizeof(*s->m.me.map)); s->svq1encdsp.ssd_int8_vs_int16 = ssd_int8_vs_int16_c; if (!s->m.me.temp || !s->m.me.scratchpad || !s->m.me.map || - !s->m.me.score_map || !s->mb_type || !s->dummy) { + !s->mb_type || !s->dummy) return AVERROR(ENOMEM); - } + s->m.me.score_map = s->m.me.map + ME_MAP_SIZE; #if ARCH_PPC ff_svq1enc_init_ppc(&s->svq1encdsp); From patchwork Wed Oct 26 02:01:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39009 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp148604pzd; Tue, 25 Oct 2022 19:02:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7Do+LXO4ZZzM4VxnmnvL+jvSnzkxG/9/vPgv6wzTnVgeSj6yxpCO403d+/FBdt2UILTYrc X-Received: by 2002:a05:6402:d0b:b0:458:a244:4e99 with SMTP id eb11-20020a0564020d0b00b00458a2444e99mr38637165edb.46.1666749741948; Tue, 25 Oct 2022 19:02:21 -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 hv11-20020a17090760cb00b0078c37681f89si5089937ejc.650.2022.10.25.19.02.18; Tue, 25 Oct 2022 19:02:21 -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=gO1jGQDc; 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 5518768BC4A; Wed, 26 Oct 2022 05:02:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2064.outbound.protection.outlook.com [40.92.49.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11C7F68B9D8 for ; Wed, 26 Oct 2022 05:01:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P2hZCxhqR0sSBVjDR6Q9ugH3X4jH2fuYZF2iVRNS2eeeABhOsMqJkZDJoaip3I6+vDnC71fUmm+yna3eSw9vvqp2S7vyx9RLpKJnBbtHHiM79C2BH0M1XP1Yfb6DhT4tRYPM7RAF+klpkDKw5N0wlpJurwuE/OqzgUWjOd4/0f7iasAhrOknow/sxCYWfTUaE8gHfXAXwwDHX5VWX25wqUpw8dOSf74uIQA/splz8oIJH4zMad1w7+rWe0IJEJvJTWvgW20WOgANXbTuNQNDuj9znFUUrABxm4ihFW2J2ufnkwSv4pwxyFhWm6ScIwl2StGHz1g4Ll+pSNnVyKXeeQ== 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=W9HPFHzy9vxqsX8rcMGe9qdEtrHh0neTawko6lVGA2A=; b=iyqekBB0JA/DZNjBnv11re4ZaOg9F+aVMZy1vbvhRlDHZX0v5W/DHO/lnVxEJoHEFL/JwkJenF4q1keRQ+/RgNj81HOdq1UFzYhto530F1/i9W2Cc78c57To8vjrBRhJaeMHiTtMVDsAw+tVX/66QBThg6Esgp/tRE8l5BA2xa8L7k6bQUllIVLDZmYDNqEorlr9BqUYYxyCFDndOFnG8n048QmwHYsTbAElWPgXfYZlekyWm0x2d/EcbNoDhSgclg7+emWbE6Ld7Y/KPyd0yRSCR81p2MpjzADopMBotXMReAArOvoodDwP5qeEwz8E6w0zqD8Ovc2giQdJShBTGw== 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=W9HPFHzy9vxqsX8rcMGe9qdEtrHh0neTawko6lVGA2A=; b=gO1jGQDcXBuhN2S7mUg4GllqWH9uG5xB57jFfXnvDMdp7HUTOYPJRAcHzznxtu4JNYeHJ8cGmW+uJerQ8jVGnig5CDymvq4hHXExsRsL3kl+plGv42ggZFNPQvT9XkmsJ47KDVYA+ovHSHl/EY8sx/82GLw08nzKUJOswyT/dr8yJpNAfjy3i8KGVG5fPxbW/BUa48+7Y04fBOs0Sr2o+6qEstN+tja+cunr7zotYhkVe3ngvjgK0lCul7AYkp+10fDbyNH6LL82SpYUdSMN7DfzUqeNTjoMYY75V4JcBr5ez5/DKvRDl4esKnCizhhxk849hIqKFotc5SwxjDKrAQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0067.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:172::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Wed, 26 Oct 2022 02:01:56 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Wed, 26 Oct 2022 02:01:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Oct 2022 04:01:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [rJXE9tBzYdYsYyBlYvGBC7p8FLkELWuhWqqXmDo/eU4=] X-ClientProxiedBy: FR0P281CA0133.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221026020148.1899997-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0067:EE_ X-MS-Office365-Filtering-Correlation-Id: ac0885cd-0a0a-41f0-50f7-08dab6f60f21 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoSzhB4sgWW4MC2Y4ACp8EG00u+HYPV3WkJiW+vjOljd7lkWxX4TMBQP+RmiwQ9n9SqcvjprscIpmKaMC/thmKGadUbYTWD8zWZAp0qLW/LxmqbE83etxpRNKGQXFUHKMASDfX8GDGuwR9tTHOyvWJEUDyhrZV8M3DqECgMFYCIkpiVEpjFDLmLLxoWTPV82Yrc1P8EucBZoXuvpATdmUNqv2GlTNcwr+vM6H/HP4YzQXA6rRiuG3fkyBxD3PZFY7FBs40OOy8XKdzUQHuh+X2o/nwMgeIXj9NEVyLSArK/uTA5aSLMvp+sqd6z6hvkwCfEVIPkJdt2qy5ouq3qIYppGEMvEMYgGeYeaOaQ37HsjOf70Hj3YzXgmLpIM3hQih35ZCNGOlPWaB/bZv2ttbGSbOt4ko2Q8yUeC0tuBhc4K3hCsWexV7QXIKDWsMo2o/5qbHHwKrlqNAVzSjKQwqvqOOxUjl97p6xXqArQiQDi1nZAsw70hZrft7Y6OzUQ69FkV/If7UB9ERzgQPLeVgYqv3tdP/XqQNFfpdRXbKKe7AZSepEl7ZKs7iAuzLobpDET3Jq/AcfLr92hiHO96hk2H3RE5cm7TlZi+cVTQaKbI9rZ8sp47faLMVIPdgeJ+vvqKeXML9dvMlQcauhq8EBo55O6u7GpDaE9pV45oUz1oanQcptszHDqQ1HhVFwVPw0oDthRecmHKW/j6XHtm0N+WFtULelYtUaszCVsb2aHS2o09Di5Ti9PdLonOvDOQY8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /LOPWg+reOQjk4zqABSNx2HR5WIwUBn5K20ZEqgxQwqmrSDZPkWT2FbbebkYVVmR+yawASR2J0xI/Uu42eQODaDes19b8go+UgyM1PGoKroWvIoXSISzOPFdWE1VOk2m1MUske/b0E3rMtJ+TicDb7s/BvXGOQIXuIcYyg53VV0N+ZtoT+Z3nXGEjjo822NDAmo3xeuaBJ4Qk0O99+/fZFZlIeOzzYlCO9kGeCgIE9zIzzcNXSf6DwUFgOK6TYTQ7rOQxkxJJaojs2kH/tBn6980hurreloWXhYEb+hu/PQNdYWed+Dp/FYqVdmERutFx0w2vGfla8dPavjfXpI/K1UNfLneXFfoYJaAqm6HJbj/daptzbuJMMFsZTji1SVsTLfhzWI/j3ZbgX9VbC+tQajX+rbjA6LDbZvTGofeCAagmhviSXyshI37/72zRI1KVYy6ixXL4bRgZyVAUmxy/KstsEp1HbIxU0Y5HF4eqZzqPHhd4J6dzP7AzdmOE7jZGPoqjCwl7lChUbTeum2EF8kNCeyWbU4sBcZXyxkQKF2UXUkoSdzpesh2LtsLZ/On9q5pp94DJdv1DuS1j9xAbkliHK64Z+xHn2jXtqPPU1pq++0lmjg6vTVeJoIFebJAruIy2plCat+/AZgJhmgMBXcsWzPVI7wFPqBN+VE/luPGejx/DjiUeakTyUjw2+qF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x3XP0vAqezKusxowVmzl1Dr4sGUbaW4xnprcGYdSGgv7Yohiwmr/MMAOBM9YrDLVAhGI0mY3m7QzNI9lCtUjNfndGjRAq/eNgLOqbeiG+yLk0VeMCWnVAWF0Cfuu9YOWS6ad5KpxF+pjuTaCTO+vS+l0wTChDyemdBr2WElmAiQv1gd9JydnCD8NQ4qxvF7KY6V8yiL3E1YZpld4CfiJmaW+PV7bu0ku7mWydSMqa52REonW3ikjNvhnDPSGza/1odKYDp9S+xMTtcEYCzHu1vsFjtXZo6nCab2KzbI4BfSOhheLZZZgJxNOKKCKCEb0Vh1Wcl0tN0qwk8VOl2skdzzvXIz8FkIhncdmUvVw9kIyt2QWvEG3G9y5yPxd96t7AwIXeoweEn5aGrfA1bWoPZSixuxAu5S5QUik+zzGKXDAoX4iK+rA/Nyl8MeEMn4dsqIT+ZPziZuz7C3hZq2aFi4qrLyCxEEtPG+lh+UAA8dkC8KzrlVaWZ8VA7HoD2B7SXSulbKmEYOKPYigP7EiRWTv9c4qcogV8GS9ZcZnlCrVHDLMiFbtFCCOaAT6+KFgjDgCDA79sItCW1BkAbcdr1O9wfDxyD9B7VE0YwwzOQbibyKG9ZPrHFOaDaLpfkbjXwHDFlM9PT3EjeTAby11abug/fhYRXd0cwoq2ZnoVT4NiREDKj3VixDtsTom96AJFvw0EqYfBua5V3Qv9J5b9+72EdMR8Ow52UovAxNC3m9ZQ9iaFXZ1bDv8KdcrUqTJ0nZbvuoUy6qPAafyS2uNpMla8lUwSMMMwdt1rt03hiesBt6y3HQy6AGnoJ7X77O0yfd5IDMWB/w1CBXsqEY3J8EwCiaOfScTox9nxSmkIH8iqfo63wpFPNhg8HKIdmGBtpPRVk4rOff16YJ247/4MvlQGdWYCX4Xuz3o9PomyhKQ/YaCHDxiLIg+qWJCBQryscfnjx26j7pi9m1m4RGt1jsiGTOuCz+rkVeMdEfTpP6zGIiTCEw+Puzr39uZDRuZ3e+1zXzGipXZUVatpbrKkB5o8fmAhHE2UfppJ9hKvm1itVBmpOWTsMyqKK4/iEYH0jQGKUJG3dVZNW9QdmDHNiKoR6d0DCz5NgiCg9HuQh+sNy6redHRkbWycL+SuA9D2SBB22pjIUihZZSlnSsOoX5YUbzPz8oWmf5LjgcFZ9zSN2TLxsWkggSO1G0koz+ZVZIu0gadrJByXNkCUH885DfcCJc+n8to5vThTRzlXaYvPS8wgebTdQHODU+Bv/rHRyYet9mAJl56O217K4MKO+ofFVgp0Aon5A8JdB2RdCeQSbRtk/jZb8juWAK0LO6A X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac0885cd-0a0a-41f0-50f7-08dab6f60f21 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 02:01:56.0597 (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: PR3P250MB0067 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/msmpeg4dec: Move setting decode_mb for WMV2 to wmv2dec.c 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: /R2AwU1jmyox It avoids checks and allows to make ff_wmv2_decode_mb() static; furthermore, it allows to avoid a config_components.h inclusion. Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4dec.c | 6 +----- libavcodec/wmv2dec.c | 4 +++- libavcodec/wmv2dec.h | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 8e12e1aab2..bc554ed2eb 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -22,8 +22,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_components.h" - #include "libavutil/thread.h" #include "avcodec.h" @@ -38,7 +36,6 @@ #include "h263dec.h" #include "mpeg4videodec.h" #include "msmpeg4data.h" -#include "wmv2dec.h" #define DC_VLC_BITS 9 #define V2_INTRA_CBPC_VLC_BITS 3 @@ -391,8 +388,7 @@ av_cold int ff_msmpeg4_decode_init(AVCodecContext *avctx) s->decode_mb= msmpeg4v34_decode_mb; break; case 5: - if (CONFIG_WMV2_DECODER) - s->decode_mb= ff_wmv2_decode_mb; + break; case 6: //FIXME + TODO VC1 decode mb break; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index a70913134c..2daf6c70e8 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -445,7 +445,7 @@ static inline int wmv2_decode_inter_block(WMV2DecContext *w, int16_t *block, } } -int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]) +static int wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]) { /* The following is only allowed because this encoder * does not use slice threading. */ @@ -573,6 +573,8 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) if ((ret = ff_msmpeg4_decode_init(avctx)) < 0) return ret; + s->decode_mb = wmv2_decode_mb; + ff_wmv2_common_init(s); return ff_intrax8_common_init(avctx, &w->x8, diff --git a/libavcodec/wmv2dec.h b/libavcodec/wmv2dec.h index cc410afe17..bc8745bf6f 100644 --- a/libavcodec/wmv2dec.h +++ b/libavcodec/wmv2dec.h @@ -23,7 +23,6 @@ #include "mpegvideo.h" -int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]); int ff_wmv2_decode_picture_header(MpegEncContext * s); int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s); void ff_wmv2_add_mb(MpegEncContext *s, int16_t block[6][64], From patchwork Wed Oct 26 02:01:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39010 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp148639pzd; Tue, 25 Oct 2022 19:02:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6D1DYQfWBykrNZaA5DFDUCXpNZORsPA1VARJjy7Q7aOmhCI8nBQmSZpJTDsTXUBh4ioNJc X-Received: by 2002:a17:907:dac:b0:78e:17a0:d1cb with SMTP id go44-20020a1709070dac00b0078e17a0d1cbmr35560409ejc.618.1666749747243; Tue, 25 Oct 2022 19:02:27 -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 k3-20020a50c8c3000000b0045bdff8a884si3541914edh.268.2022.10.25.19.02.26; Tue, 25 Oct 2022 19:02:27 -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=ANr74FqG; 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 68C3268BC68; Wed, 26 Oct 2022 05:02:17 +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-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE9EE68BC1C for ; Wed, 26 Oct 2022 05:02:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PStuRhZQb2ankUG6qRNdeaC1Pq+W+bbyX85OJausW71UIb0YomGrkBRitDaZyTERth65pSPX/orNVmLfgX6XqhDnDlDaJoYuwuBOyTIJS3G6+GBQLdGMJRrVcp4olDegFOslhP/O3Ko6QYS+ZSTZQUw2o+6zJKqsSv4fdRO/u5LthQf4Za+At/rnlggZgSATrvEAmg4Eflh1miFzx5SMhpIqhaaKZrhSqveBxzAyN7AYKzqKvz6wNtl7/eKVDvMB9HQt46dURcdkS5rhYZi0av2TXODFgjjdYBo7TSTqz3hF8RsXQkrsX/RT8wQxb7arrB8HjAimYByGQ8+YQmu54w== 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=3NfpDle9LVjRz/23tgNOL1pt+hgCuDQ+MbO+cjV0Y18=; b=C3G9kotLdeSwmZmsYikazkkquFwS26qBwD+DjADPqL5collk6MOcsaMWTakkTenr3/9IH3JoQGb5GGS1ilBP5okTQkflpSwujc9StBNUTgQy4PMkTcggiwz2moWauFw0JBpvoTIc6SB1imDpI0tVFn08PH85c32BFVd7XEuilT5bZmfABprU02EAcx+kEtR07IAL7J91+ML7yXPXEGDS9bZRNcj6u/mxUvS2lJ9fKu0NzYQTAER7Ejuye0BawZ0uxxDoN9Oa9vy6aSwE9CwiaSX5tK7BkTiDbNijvnOQ7NzVwytwKVrmrLCBgKlRVDU2I4T2YHfSVYoGO36/U7oBdw== 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=3NfpDle9LVjRz/23tgNOL1pt+hgCuDQ+MbO+cjV0Y18=; b=ANr74FqGLTTKhUBsNqsFi218EgpJATRV2EQ4l+XkchTd7Pnb5gAoNsuXSIUFl++gR+yU7qLTzeO0kv8SVit6ZMa7qXT4ba9R+RPD7PiymOfYOrcaD2Y51s16A+fJzYAs6F2BPNCv+sec8nDmXPsoYXX92E2lSUkqUk5RSOgoj2Ak6XTi/wtd1IoJpdVW1AlYMigb7S7eL9VjwVWMfREKNPmddx7u52I6yMkZBWMYg0cNNH89O5qzHjQXrOb8Y1onwHwh5rhUlRGU9r6hrGbIAQsMRy5vO5Cv/xbjkVaAqbrf3uV8v/gcHgcsz1BWWNkJVi2DR70REKXJ5rR/nlFxCQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0067.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:172::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Wed, 26 Oct 2022 02:02:09 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Wed, 26 Oct 2022 02:02:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Oct 2022 04:01:47 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [XWOW7/Tj9rTbwc/foA+t30ckVH4uI6hzaLDaYmclKSo=] X-ClientProxiedBy: FR0P281CA0133.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221026020148.1899997-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0067:EE_ X-MS-Office365-Filtering-Correlation-Id: c449f046-3e41-41f7-d2f4-08dab6f616f6 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoSzhB4sgWW4MC2Y4ACp8EGUboAi/w/qNw+tHBcw9x4QWRc8in9cFYZkI6V1oqat3coPlXIAFst2eJejFdxjhR4yB3XLheZLfnZGN/Y35NKc86WBlag5yL/LPG5qyxDX//zn51IurCY/pO1+XAPy39Iaf/h355u2GA7KXkDYZ9PleHRT/UC8rtQGY7MshDn4h5EIIYQtI0eQwLyPGr+l+/CQUN8S81eAFJgstDM8lI1IrVmLCKNUEp1NLkdarb1laMLtdSBBY8naBKnr/VyMxtk5TuwMIj1xxWx6pShT8Ta9Tu2lAIrMV0oX6/zLfIZkqt2jf8yrm8r13mKTz/NaxMhrhymhdE4kudQk5znbVMwE7CoFQQLeZQhPnvX6MDKM36joeK0qXJpWqSK4GGciGkfct9A9xNPu7Ir3ECrgEcY0LSN6S4i6sj1Gc4dYtmsx4+2fXj8WLL8ku62dm3t1gJ154uI8kas0yKNT6jQx6+oyO3g8BDbFp1Q118bryrn1X4BqtF7W1uUpDTsDKQlDPHE/dr9F7jAJaJCyEOU5Hnt2ciRh2+faqgtZp9XGx3da5dPte1Y/3VcsHJnGi15Wte+0cZwrPlInyvPmUx7vHTgCV19Lsd1K+eumVpJuLMGFVFaHvUSpXsrIAMWHOMTp/7ZCM9zNS6Q/xQgkkvK5jEN0Is8cyA27PKIWmXi5BBtK2UtBHsmNQpHnHVWJeRSVkpsZ2+PEZCn3AiI/TevzNU7b9XIjlDmLqTKTj0cJpakqCA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M9mXmpXVmGhKCejLEHCLW7XxfiDAR1wpia30mezJ665VNeg+73wvF8RjS9gZ2I/xSackDTP87YsNgC07bAKhzQZlpRKgx2fUwhqoGZKgUCrbZA7btUQLn+z/TYW9qjbYuiV73lih5S/CR1nCQrT/9fHB39jOA5C2YrLBJzzR3q8dAEwZ29uhFyNmsAMMuisFtwQWyY+tTJVnJeM+wNcQwYGHOLCI+UAVjbHPglwn70sANQ+fY9BH5HLzDt3b6PMEZRfgju7hy0kopFm4svkyl4PcFvKr5QiHHmRVZVvDduj6DphvFlsZvP1KfkQxqadzh+s6HL8jj+HybrWNQVa8by12qK2pH1cqrLG0y5ybFb/b99BkET79+0ZD+UCq5nCiWGJ0GqMeJZtKvVYT1cDypDEhKKpXZcOh0sNSV6TjMsMrKA661N7MsPCAMVhTdbj3LiXF33pUIGjwQUKqDQUOXRHiZ0994fFe+TyM/lRXVnmvIDtfO3wluDXrLHkJXOveDKBJyIQsYeLxf6L+SA20Oy6x2DLtpQ4TxtcionrktBAvkKS2IOYseHNsEmn5Gb4GuS87OwDCtloYRr0SJHygYl7eqArIJwtma0ZJow8A8LzgPSlZxivFvDWJWbKRcggswUXWnQJ4lQ1chXQzis9J7dpllOlVxhZK32S+hBwhYZ6+GHwEnCUXEv5de2w+sweh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LmWHPFlj+Mk9qXGDVbL0yr9rA7tcNLusX6MJQCjnAQIieJW/1pukqukWi2ucXLgBxpAV+icd636414MTiayTHGKtAD1SEguyeUPlCSq+Vefiyoxks34/I6mbUHaUDbGbbVOugAFHn1J6t6XlYt68AJOoHx6jxM5Dv2B+XzhYWQk8YiSSTm27qp3hMe57ieEd992SAxab58uwoBSXLJ/tbaNaaHSFWLdIx1+Zb3/QVkF30xuLZoIffm4oCzfkZ7sHRaTvr5SZwPLacEN2y54jiYXY75fm50c1xAb2FxQC1zoTzylWRUdZyrmAhbTZzgu6S7Q8s+p/mrbTLCTpP+USaB0+t3FzWVLf4QmXH5qsBGcN3q7taFM8w3DUns4hZhy9x+TXJye79y/lRe9BojrhmUcBZfcmHKaWG9cUUUUmzbKlrfKJhjyRm93NOBuo2fDs7wUYZeoLRXT/GFLXfYJAikl3zLtTW4hRmsKWYzLR9gZ1z2KhgRNFVhWR+nV3VAm5gV4hcKIf1k5pS4wFi7lyoAbbJOBtD8zrZfsFEkrumS6CjXHXK793Vka4U+UGJSdKhEsOEq5s9ePXAa1/OYT1WlJPyLp3hWFX859cxtSi5TpPGdSX8W+TjJ8bYaGmmEr5gv4iQQloUDPHoqUfSGbIm+tfrVw5T6XcbwksGNduqBvsbEePqfixzRRjl2qLXOv9oxD82YZ0PT63Fvsu2Qby2vLejVgotBvRumC9Y+GiujwDbr0j+aVxekI1puFfTV44CxiOV5Wsz3dYKga6wp4jWO8SBePMZ91/4L5UqKmu2BKvwdCi1aatxZNDNtFf42ndNjpycPl5z8Nop4edvnVPFJ5To7H5UBdnbODXo/4XuJ0pmdjZLThm2Ub/uFFSSptXSiiylAVUOpS+ixcdZEXYMzu50VzYhAk0otIxncIZ6fATp9G/girM/cbKJgxj+NyHsjrJZMUxhHpEzcxYmPB30SbXOi62x6AJYUnyy1+Kul5/5ShUM/BmwKp/OPpmzp/EK8BI676hBNLie93UZrJLCbM7wuG4lYjSx1b+zkNV15WKhiLp8/dctClQllpryRyin4R4mpuFYXBohwoOxFaKcCGz3+3XpS/qBEFz/Q87GYgpoZRRBk0y+BebAWW9uFTWsVLV8bRZfQv0aNtMY0Q5XWUARevuEFY/u8L5SxX6QW8VIKW1aNexTI4ceBDGrgNiburXgeJsJhQAUZv5CJl+jiJQ3VgZpe7PkRBxRk0o8ixQBDPLKup3xso8D3ke7fuxp0gKUP7ceawFta7HSvTE5mNUvS5nlW2ve76UdoNRY8NWHl+bVeqxrArTeBK/ZpQE X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c449f046-3e41-41f7-d2f4-08dab6f616f6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 02:02:09.2018 (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: PR3P250MB0067 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/mpegvideo: Remove always-false check 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: Wr1Ddm8lEkCO This basically reverts cc0380222add8df8ff9b3bd95eaf2b9d8c4c0d11. At the time of said commit, cleanup on init failure was very buggy. For codecs with the INIT_CLEANUP cap, the close function could be called on error even before the private data has been allocated; and when using frame threading the same could also happen even without said flag. Some mpegvideo decoders were affected by the latter. Yet both of these issues have been fixed long ago, the latter in commit e9b66175793e5c2af19beefe8e143f6e4901b5df. Therefore the workaround in ff_mpv_common_end() can be removed. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index a04d519ccc..99b2d8f6de 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -789,9 +789,6 @@ void ff_mpv_free_context_frame(MpegEncContext *s) /* init common structure for both encoder and decoder */ void ff_mpv_common_end(MpegEncContext *s) { - if (!s) - return; - ff_mpv_free_context_frame(s); if (s->slice_context_count > 1) s->slice_context_count = 1; From patchwork Wed Oct 26 02:01:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39011 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp148790pzd; Tue, 25 Oct 2022 19:02:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7yfBztSSnCLTl1k2wcS0to6HuRX+9BKaGcX0a/KGOn8AesYh/nUHrUvmdHewOYvkH1c02u X-Received: by 2002:a17:907:8688:b0:791:91a0:fdb3 with SMTP id qa8-20020a170907868800b0079191a0fdb3mr33391219ejc.499.1666749756597; Tue, 25 Oct 2022 19:02:36 -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 ne27-20020a1709077b9b00b0078341b2e269si5215209ejc.886.2022.10.25.19.02.35; Tue, 25 Oct 2022 19:02:36 -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=kpr2Bl63; 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 720D868BC83; Wed, 26 Oct 2022 05:02:22 +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-oln040092074082.outbound.protection.outlook.com [40.92.74.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E193D68BC1C for ; Wed, 26 Oct 2022 05:02:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q+P63CtutFruEeC6oYlqL6609mcO0cOZCKrXueYMdgeHCh8F5iBO9718PQaN11Z/wr58mkgs7P4dt7mXTA8eiUr4qoUDKBAE+eep+U0dBFUS0IB/C5GPBvsD83SqBmcglNK+bwUgRuc55WJEsWBPBRZPPKxAWIYb3cqisU5W5v4HY1BRDMVot2rXM59bO89+2EWnfaP9LWq/vSNmuo3BTEZYYEDdkxUXRJU8XBYtahl4/lQeApnR+q87QvgGwsRLjKgYFJVOrF/SIghWr1Ld91FA84MyhpWj/x+ekIlrloZ6Z1hBiUGLJHUxeq5v+ZheNWi2fm265u804ksTzhNJkg== 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=2+vW1H4xa/Ufy7b5+uTNrhATbLonMg19iTVVLLHvuWQ=; b=RjvwX5zAKSqAiIT7Z6nuISJNin62zplmfgQ/A0lRN4MNMvgA9tdd8qX9Hn6ZXX8FCj0icBktwOb26ZQw9B2lbEZeZeXq1jzHNZKolNHTkMFbo89VZpiRaARpbBbWxXE0kEju1AJ5JrFiezyPEz0hhd6aeqSvehakaYxoBd7wyYIHuHSzTQEOvD7L5AZ5yI/N1MskkOC1r9R1hSMV5QxyoXDjlSSmQ7EYr7dvGPrB7tXHqreg2E4o9mOkdvD0nTpp3RI+XvSjYlUKir6/rn76r2Vrq9cvPuNamrNGTt733x0my9v/d9X3WE1TcdUsdZ8NoxoOga+NfQ8b0YyDXgqNig== 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=2+vW1H4xa/Ufy7b5+uTNrhATbLonMg19iTVVLLHvuWQ=; b=kpr2Bl63XYzPD4UGDuPVANF15/IgkEz/l1gil8ReEUGvxN/pGCdmmZu+ULCBTdUKaBLE8nUgB/d6v6nMf2FNdy+ARETEcSVqLsrh11As/MzgOF1UxKGW3oQbo+esFimdgM7PfElfLotolTEViw408UEb35q75O+hAtVqGy5H2h5lS7B682Zn69kXwWmracSh0QVsDHmxDCIXeR+5WkV3gX6nsNQ5mlT1dTHKR6bQjk0/88e6KFVwLVnjtmuAmJCKbcSPeDQRwVjixDZj3Z2PLuKDA7U0SGxCVM0y6W9WkuO+td8Jm0VfdOeYySoT7vu3NlHRKgdomydZ8ei7eD57sg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0067.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:172::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.21; Wed, 26 Oct 2022 02:02:11 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Wed, 26 Oct 2022 02:02:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Oct 2022 04:01:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [DI4o0lQAc+MtHFcNmncZjBR7o3WYr3BCpJDQoeG1Zlo=] X-ClientProxiedBy: FR0P281CA0133.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:97::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221026020148.1899997-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0067:EE_ X-MS-Office365-Filtering-Correlation-Id: 32c3760f-d939-49b7-7bef-08dab6f61887 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoSzhB4sgWW4MC2Y4ACp8EGoluHt7OmmuNtqg9IlQ5vY/ZGLYzL+srjvAZ4yaM1/do/HW7pc76N6upJ7IeUQKl3RcBnJxzL5BbxJDCIu0fNE0l6lT7kB7vbBgOB3/Fzee2iR7E2HXAeYxXn1U3ODZLYwJuc/QfyLd85eyJ304fIl2JyBGXatSZ4tfwuRnBOTzhH1MXh8LHjxvbSWFhE/c8GN8wU4VttFuTQf2u+hJVdtbbUnZOItZXnErKWrh3otE/I480f20YOicyCllCXap9YeijaVFaKeQmMdnnIqA09q9hgn6KGbQkXias224wsPQZGzX11qy9tpUxLw+vorEXPpKQrQ1mOI+2IHZHDez7mc2m4U+cAE4nd6GyM8drKIVCfv+oHXSqEAX+QaQOl//hR2lxx6o1gXK4UoKhBj37BixabEkcSki/lNm5XaxCR+jRfUtS7YyV45ghu41I6WntK3tx9LILtrr1jI+riQJRZJbXaTM/ImwYbYyXddx00obZfap9mtRwUlxQw9Prxh843h+c3uA533sgB9hKonQAcmTYnXXafNwJluoiZMqtMIFe8CDj++CT9xexicYPXJHL/jAFhC+zCN64SN6v7Kdoq9VJJbu3OWVWLFjpPi3KB7qpQBzXiLSbRM8oiPmMbxQUZT4LJP8IZSAedU0ie20DCo2w2ljgfdNdPNrY04MAkZov7j4JV09UFX+824Y7hfN/ZwWfSI+ijl4SRtv/86O/vE9zYEDACXlGXbpAH5D5cCKk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6+1A6ESRnSs2UcnlhQfgM9hh/bYXG/N13Q0i1akC3+M+8Y/qsj2nJKqZPD7otUF3bIbjUm5d+74UK2lV/HEg0Crxb7Bth5wuWp+XDzwQdmQ5zKlN/cjlMkNSr+7NL9Vd+52E9UI0kEjWIHSlYmBZWXii3jqCFEVh9qNQIYVP+V6Y4ztA5qa0V/ODgP7rELoCNj9+EC3Lnjpe8iayAUgKxeNzDSkGKlABhf8E3Zk3XK1wlpDQ5sOAa4BHuVi7LJkVfqT874kxoR3SxmkBeoHubBKI3QXNCrPwEZL1QSkeppdJLLzF1df17Y31C/RJWHje2lk6N+OVTf3ccRctm7bPaJleKcyaAX+gZ0VwyaqogRP478YdqBOapp8cgN6TmqMl2w75xVEsVyMkPm362g9yHm/CWxo/R8uik6ntouOczJUpq6wJnibiMYqZ5b8sGOqR/VP8J5RsTOY3HrSaYGqYIPJGiaL/YPR/wUk/lFFUKv9jGjEVyoEM63O7LWZsITO94Ifqkh3vMsKJrgWB2ZhY6EEud53HM7vKChsU+gMoWcRtWSItm0SuROJxl+QHmMXydb2mEsL/ZYPtHKGzjONPHq7s85ikFSDCHNgq57xt+PrZ1vikVnweW4QaizIjzczP2bjnJDD3lnnlqugnVhpWCQCbtGrKc3CD1DGlWCgemBVny/0PjpiwMVBDqbqdZkfs X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XGPE/s39+vcZrakSQMeK84L0L7VNI1yb6A5LHGFDwBUs/RnIp2/H+X0SA+uH4KEpGJhMCWXDpnDL5WMMPv0TG+4D1ypg7QGhH0ZyL1Pmnrsk6HXDr279h9hnFbcEIYYQADuZgU6YPWHYvvUAGYNl5/o17e2ic5vOci1krfd1t92HmkY+KD2hkBm85zg2CJPW2uS6pzvOqUTGrnZneWkZOn7/HztFc2WqjFZPgy7n879492dyalc5bsx9RRSqeyUHn28SJaOA1s12R1j4dJQH7bTHisLXVWok3/x6S6/qJUbE0zg0iGGVGWjZqb53Uugspmnkd+SdDKCBesLeorxCARjoIDP5BxaMS9JYnyhMIrjuv16kAktPQfOVJ7Q0FSw5STnj0rRLAVdEz4ld5l3oXrKYwLCMVRwUBhEnZVgyRAsjbCgdibS3ZJdg2Q++oW8rmjtikIzrXo2QH2F9ThxmBcb0OOrJ+dp+Ztp+cfC6oqpj4lTHNX7N8mVaVGZJPhAKefIU14qojzEDxhZmH/CTWuuA5T2ITT2TY18oW128bUeOMXHNfKDfrlUaj9p8GshmMDwDK/fID4FbiBMD98MYY9kmIAcC39tOu/3EFm2qJiGTd61LMT74BZ+NuLZzYTEgxf8YXMEknZp0CFkjaKHK1MX2Uhqit4oJp56CQfI/R3DUP1vRNbnvMB02jzdtTJ38fhulofglj91AG82MAmwQYcEQTIP9eeXVytXfgdZ0+fMoWg3Gj5xbhKaf0ZKs0zTe8kRPdM7vAu24JNMs2BZb6c/eIBhKMXTh13GXT9FwqsWjpxCPOoiOwUnBDpmGW4KXB6m4+DO+vMxb+MiD/htmb4Y6TjEW4glTdhslb+zTY9BdvwxuIGich4MyvIT4NtoogPwMJ4XVFg+aT/FWXRiax62Zy0Y631Wp/FfTH9agUdc9AE4kynkWZEyv50bhVpN5UfxhlQxOcx0ggQsLXymJSJXcv/Jf30UuxAFXC9MERZPnGAzuU+0n/NcfZgq2Ta1+c7RniMNaQZqVjZ1G34V+H1I0YhQkAuZk+PuvgwWjyGtJuZ6L5P9DOiU3IeMsv42g8a4WpJmBvh8JJ/GR5q1O34moiMdLpjCdu5kwyOaCA8HJo6J81OXHBA1qbA5mdGyLHkdJXTo/8vgQltP/+t8I1BsKoZ2ksLhfFNrprbx9EqRMkMjqq/SnHv69dP1yo0eEOyWMt5a9XLvGcz2xNgejyQKm4JHLEMDMn4pzmcTIXdSEgEv4eBH5RypfACLNYkKa5/wvCNdwKAGB6w1hP3YEoOGSfSnHwpj3x7G6XpEA/S4gIqpiPH6ngy8CzFLf23kt X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32c3760f-d939-49b7-7bef-08dab6f61887 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2022 02:02:11.8120 (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: PR3P250MB0067 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/mpegvideo: Remove incorrect comment 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: SKQHmtLtqRlJ Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 99b2d8f6de..9a58d68524 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -786,7 +786,6 @@ void ff_mpv_free_context_frame(MpegEncContext *s) s->linesize = s->uvlinesize = 0; } -/* init common structure for both encoder and decoder */ void ff_mpv_common_end(MpegEncContext *s) { ff_mpv_free_context_frame(s);