From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 70C004545E for ; Sun, 30 Jul 2023 16:11:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7732F68C341; Sun, 30 Jul 2023 19:11:34 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2089.outbound.protection.outlook.com [40.92.90.89]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5A0A68BDDE for ; Sun, 30 Jul 2023 19:11:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eilgMozq/PsPt5lQD/K6zG4iJGGnGt4Yz91gqoQeZCrIVKdKvA6qa6V3G+LYz4KwqGtsGcB7rxeG6+iPsAiREDL/ENHkTYYwj2Kkx5yHjgGVrGu9ac9N21wFHW/DbJawSAiME4Ha74YkyjfAwKk8qvGxABRoCMWizsy9kGgDarqrqByuma3WMIXhMTZ+EZOb2aMnGxz2sUJpRuzlabYR+Q6Z5Qh3+Xea0LibJQF4Ac9pikvYc3ma0qVpMka7tkC4A18cvojZvjwVJaFo5ofwF2+RN60imQx+KilJ28ylEWxlXI6fSsIxz/KOXTUX6Xsp5qwjGjMR3CgtvPlnym5wbw== 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=gntTO9poXLSkrbpiLIV+IC6dvH6d0doS6PBpoBiqtDU=; b=T2E6lMe2dDBGg+UQZYyU5TytRhEhn8PBq4x/6LZpIcddXIP0yaLQeARbcQqBdYFyg1riiox7Ao+tUoOWsUwbg8QeKzmwF0bDbW5oqxBC9WInRPiCAKWZapjqMxNpynIzfpYJmILEiyETOAdK2+MAE7Jqqt6AlkGzOx5S6RneFhe6HJ757Zv7KAmR6c5iZFyh7OFSxYYD9/cK0n+i7iKtz6oy6lHdv6slhiT1eLkqjN55qiU9r745EF9uVKW/wnpy5e3HL7QDXLQu+0pKBNkgBHfW6SSXZey2a9TPVqt1FxQsv3XAXUIrIpSa3LPK0R3/7MbcuJDN+lEKpSFgg/U4Xw== 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=gntTO9poXLSkrbpiLIV+IC6dvH6d0doS6PBpoBiqtDU=; b=fdg3snnpv1b69gy7yhPRRABGYpjmYFt3Qoofl8aHGggjlay9DzPZe+u0d7SnNmnCRF7HEZ168EpN+WWr1w0VS4v+G5gvYDmLfiwdFV7FQ4J0hXZ0E/E/ceptTy2eJfuNluUSzd1bYhQCt7S3VRfaM/tHhtLYbM2ozxAJgKaMq5J7y73a+0Yl/09TH4uds/3rnbRb0o2hgTHrU69kskHhxWYkJCT++gdK9xj8SdqGRB64SXdZE1OQXmxspmxxcNgqDWtwUiC5AXvN6SE3ALmNKR/Fyj98a12UlzbK25kjq7zyOjS/xra3rceuUT0UxDmRmfSyLpy/fnVI/avZBEhAwg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS1P250MB0407.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4ab::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.42; Sun, 30 Jul 2023 16:11:27 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.042; Sun, 30 Jul 2023 16:11:27 +0000 Message-ID: Date: Sun, 30 Jul 2023 18:12:35 +0200 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [XmvID6i7nHXsMjnLmN9pkDtzct5G+VU2ij2L9Qg0zBA=] X-ClientProxiedBy: FR3P281CA0202.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a5::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <3a72189d-b06e-40a3-d166-460287d174b8@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS1P250MB0407:EE_ X-MS-Office365-Filtering-Correlation-Id: 847e040c-d387-4c44-25cf-08db9117a0f2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eeDvswIg6EpbRnHoD0rjdNIGg0pkBh2j5UEolim5NTRR9Wrv/n2J8a2QCflWK2CkFz+I75I3qnMqTWWv5/EgdZSmeSFSTeTVU3ffGp+i737TLsF/wuOhXSpkExWjpj3joxsroBQp8nMxLe5s1HpW0XRYOrspRlaZAQ9AqAbNBlgmp0eSsl6vSQIh7kZluKcWs/V9enibyGYvR2uK4PWed4eAq4syhI0oz8V4x9/BlA8q2WKbp+M7QX+EOV4z1F4ILFqnC3OlaGQsyvMrOkivOl4VNJReYWjIdRHqJBewcVx3IFOGRtbmMTYf5P3su+7p3a/eHqqxJ91wMfREY8PaWG+qJxdOgICTfNsGsy9SSW5+Rw3uHlCiJ7Se5NjOQQOYQF96AsGi/vgqgxq9yezLLVt7OK4MexbmMP3KfXgVQm5nvX3D0icwzE/ZC73tEnKPOs3584fJLvS2+28KGk0NmMCFXitivSXI4Q9KrxgRaDKSbR787d7MduZKb3jSj2PS7CItdKbuYIsJCDYkPgh2/lxWtOVlUfOzm3w7yFpbhw2HCqeWo1Wzo9jwQn282QZW X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dWpmdFF5aXh4TUx6YUJuQkYvUUowTFhNR1dCZ1o5MWpOY1RlWFplbzB1bGlx?= =?utf-8?B?SUZ2U0E5V3ppSEFvekc1NnFHcU9aaHg1OWlLcnFTMHZUMnFTSzJEaG42Vlk5?= =?utf-8?B?Q2cwSHY0Vk53WkdFdEltM1lpdnM3V2ZlYkExbmJMTSs2N1lpVVlXVmdkWWNr?= =?utf-8?B?QXFmSndXM3JZZVhWVGZiMkV0SGMxaGhrSW95RTZ5eXRScGZBd243TTVuT1Ew?= =?utf-8?B?V3RxYzdUczlXRVpEUnM2VVVYUXZtbExxY3hDaUg3aytkVzlHZlNDK3hMeDB4?= =?utf-8?B?ajJrdTJJSUVCVC9HRjJ6cFlTWU5lWDMyTk9Ra21wTk5EWHQ0TitiSmJNdWNO?= =?utf-8?B?OEFaR2R2SlF2aHI0cEtnNFdNcmJON0lpbjJJL205WHdCQXMreDhQamtoQ1N5?= =?utf-8?B?aEVxT0lUaHl5RDJ3bytBMWpFR1M5WG52bkVqaVlocERGandscVA3MUNvbDM0?= =?utf-8?B?Q0pjMnhmc0x2UVdPa0Jpd09Qd2ZJWVJHT1VqaVg2R1J3TzhROTl1SzZHUWFy?= =?utf-8?B?TFA3azhCZGU1eWsxamFKWTZoOFJqcGJMSi8wV1VJblBrYlJna3Fpalhwd2NH?= =?utf-8?B?OXIzN0R6SThIR3lvbC9JZ2hhenF5a3FWNzZaQmNzeHdYLzZNdjZGZTgvWWJD?= =?utf-8?B?bHhQbjNjVnJqSDBWNUhjenh4Wm84NEszMmVpVVFRbDFmU2FXZE5XWXdQaTV5?= =?utf-8?B?RVdmeTdCa2ZybWplRnJJbENSbDFmVDQxcmFxcE1oSStvalQrSkE3QUpaaXIr?= =?utf-8?B?QXFUUlNTbjlPUUhEdU4wZWNHOGtJeGpDalJqNHdBS2JucEowZ1NBNm1NQnYr?= =?utf-8?B?M2VmV0NiOHBtZm5yWm1hVWxOR2c4akFGSHpUMFlBUkV4c252Ly80eDN3cVJn?= =?utf-8?B?bExGN0FOTEZQaVRmSXF0NTMyZnJPbUo1TFVPY3AxdU9kVkUvb0FSelhoU2k3?= =?utf-8?B?cW0xam1mOG9oK3pJdmJ6QUE5OWlTSmJNZXh6OUhRSzU2alNwQmpJVjNyMzVo?= =?utf-8?B?QVpMOW9odm1sTnN5UFhQUmZMR3JEVG5md1N0NUJFRXdxWTEwN09wTjZQUGUv?= =?utf-8?B?RW1Xbm5qMXdFeHdRQk5mN1hrd2ZoUU81QXB0SW9POVYvQmNRNFpVZTRURDZO?= =?utf-8?B?Z2VMWXlJN3dOZVo1TVYxelYwUUUyN05Peno0bUJiYjJDYjE5U0xsK2k4Mnd5?= =?utf-8?B?ZVF2ZW1QSXhiYjlITHU5dzVURE5CSFV5d1drSWxFMk5uSXo4TDdYM2t1UWFm?= =?utf-8?B?eXpXUk5rNER3M0hmV1pCQi9hRzdCbWhOVFNTZVEzL2hrSGd6MERCbXJBSEl2?= =?utf-8?B?SkxWZVBlT2luMWhwejB4MFdzREhjdC9sV0dXV040MHdIS3M2d0k3emRBcW5y?= =?utf-8?B?ZURnbFZieC8rdUtxZFFLTTR1aU11ckg1VCtXd2FXODNnUmgrSHMzZTJLZXBm?= =?utf-8?B?ZFpFRUV4QXFaa3FzZjVWNlN4cm4rTDh6RzVkVmFWdDA3WkJMMXlGRW5KbGdn?= =?utf-8?B?RURwRURyWERIWkNUWlJRdWNBRytXVi9NT0tHa3JobGxmUEhYRHk3dXQ5K2Vj?= =?utf-8?B?ZW5YNWRDSEZabkRVbGlnY2V5MnVGd3pmU3VRS2VGZll3ajBqK2h0N0o3bHVE?= =?utf-8?B?bDU4M3pYYmRHZm5YUWV2SW1vWGgrcWpsWVRsRWEyTCtqcWM2emtTbHlMcHh4?= =?utf-8?Q?TgXiQgz1TKuby972o/kj?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 847e040c-d387-4c44-25cf-08db9117a0f2 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2023 16:11:27.6831 (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: AS1P250MB0407 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/h264_slice: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Andreas Rheinhardt: > The H.264 decoder, the only codec with which this code > is ever called, does not set AVCodec.pix_fmts. > > Signed-off-by: Andreas Rheinhardt > --- > libavcodec/h264_slice.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c > index 6f0a7c1fb7..58fe245891 100644 > --- a/libavcodec/h264_slice.c > +++ b/libavcodec/h264_slice.c > @@ -797,8 +797,6 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) > CONFIG_H264_VIDEOTOOLBOX_HWACCEL + \ > CONFIG_H264_VDPAU_HWACCEL) > enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; > - const enum AVPixelFormat *choices = pix_fmts; > - int i; > > switch (h->ps.sps->bit_depth_luma) { > case 9: > @@ -883,9 +881,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) > #if CONFIG_H264_VAAPI_HWACCEL > *fmt++ = AV_PIX_FMT_VAAPI; > #endif > - if (h->avctx->codec->pix_fmts) > - choices = h->avctx->codec->pix_fmts; > - else if (h->avctx->color_range == AVCOL_RANGE_JPEG) > + if (h->avctx->color_range == AVCOL_RANGE_JPEG) > *fmt++ = AV_PIX_FMT_YUVJ420P; > else > *fmt++ = AV_PIX_FMT_YUV420P; > @@ -899,10 +895,10 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) > > *fmt = AV_PIX_FMT_NONE; > > - for (i=0; choices[i] != AV_PIX_FMT_NONE; i++) > - if (choices[i] == h->avctx->pix_fmt && !force_callback) > - return choices[i]; > - return ff_thread_get_format(h->avctx, choices); > + for (int i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++) > + if (pix_fmts[i] == h->avctx->pix_fmt && !force_callback) > + return pix_fmts[i]; > + return ff_thread_get_format(h->avctx, pix_fmts); > } > > /* export coded and cropped frame dimensions to AVCodecContext */ Forgot about this one. Will apply it tonight unless there are objections. - Andreas _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".