From patchwork Sat Dec 11 18:40:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32292 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3356999iog; Sat, 11 Dec 2021 10:40:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwhX4R9IDqxKXZ4nu+xx9CLtsLGyrFoAoXxpqxPPPd8MLNn+kboUQulfrclE1ixKXFgvN+P X-Received: by 2002:a50:9ec9:: with SMTP id a67mr48423644edf.238.1639248052782; Sat, 11 Dec 2021 10:40:52 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x22si12460854edd.196.2021.12.11.10.40.52; Sat, 11 Dec 2021 10:40:52 -0800 (PST) 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=HLcBNjl7; 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 C1CBC68AF2B; Sat, 11 Dec 2021 20:40:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2035.outbound.protection.outlook.com [40.92.89.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99A4D680113 for ; Sat, 11 Dec 2021 20:40:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QbqADzbujKKIgKN71flQmDuptKZ+BbRy1UubaCQ+XwOx1DrG95lF1jv8cVZGB7dRShIU8phXMp/P6pYZiSvqoxZA5IOZu0kAWyvraNeJtaPi2lGXKzEnaQwxGEAUkdONY025mQiZm1rrZ730ds+WY6WVZeG4yoCFtjFS4XULTiuO8Wp1H2YlstFT5B/mr9zIbfraf+sRnU3PEs+VL7A2ItYVeIaPWph3WHN+pY557zbV0LYcnhDemMxRPLU7GxXdZ6QsDdli7kGHZ7HPmWQf/xK/y+LIzqVU0iVA5qe84yZKcyJJeWBeoih7S/Rj7YZ34eRHEkKQaadxVa3q53rEcw== 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=4eQy3KtWmb7i6BWBbxaaGDb/NMp+CqIg3uZ1zGtCSl8=; b=FP9jjVYVzC7If59ot082QcBIBtGg2VvgobnG5fRDvYWT8f2nmaA86lV4AnnnGNtiaJ+jigdBk/cKNth5SyU0MuUsuN75TkbQeYVIsguvGaxQolHCl1EEGHFhfVnDNpJqLQmJcCYCb9Ril0DV/bX7ZRk+USkneiqEXZJVK6feCYysRaNUbCUlTc+eUnERQEBG/q/JgfaEdDg59WfkjUiXW+S4hvo+mBw25nKA2tVjEvzmKkaoB89myv1U+NtSwk3vudSVXeuJSmmJIvNIDlM29yt3HfYfL0qY45phlhg1zg9a/PM8ogOnvx9+o3iM5EK+WfHhuzgdUWmlF0MYQtEHgg== 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=4eQy3KtWmb7i6BWBbxaaGDb/NMp+CqIg3uZ1zGtCSl8=; b=HLcBNjl78kXGOiVJaYmxiHLyUjEh6eGkPEwWih1Q2CkCOeJcOkTlZ5l0EmQiLS8iFpdx3ixdztRm7EdZUNy8MxB8DG44mpE87tRPsmW+YY81WZVx6jNkXzIqo4Xyt82pQ6k/ni7ZduU7VO1SJmkQB0ak5GnJhlMo83syzcrW4HHYHF0P4oKmzYUCMiglVUJqlfFI8TbBKeAVst+gTq4Lnjo95SB0GGnSZRgMn7kVLay2KukuGHLPHp8CbUMMLdqWMYnQmt1+lBz1DUeB1SwvcnHqi0GZR2HY0FpR7pevgdTi6z/VYuvYFnftJaIOGFRGKsbw5ArKFTYoUVvUlhbzcg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6450.eurprd03.prod.outlook.com (2603:10a6:20b:1b2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.22; Sat, 11 Dec 2021 18:40:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Sat, 11 Dec 2021 18:40:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Dec 2021 19:40:16 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [bnFZBhd0IbBhfHrApiealjsQxW5YZIxR] X-ClientProxiedBy: AM4P190CA0008.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::18) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211211184025.1430779-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd91227f-b845-4ac1-b0a8-08d9bcd5b8af X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UImNawVT7mOnSn1qXfdKikY7q6Q2vfk9WeQqxjbz0adBsUfT6c+hfcYsJ7QeWoDr3br3xZIt+HiE1tWY+X3s9cVOjLMVFBzMkzCBP0N9VRXGAzrJUbxMQ9Zf8kvCIsDn2cyVzw6sA9Tam3emWtrGj9o2QIOA+gz9HBXiT9f8a9BuXzYN7zBOegaokNU/c5NFRrGLqWCEnmg+3tCHzGuBgfpA+ORYdzsgFEkEFmxXoAGnZyyzwP45trjT/p75hTnbtr8VJgGqHixzVybsgfrX/lGR12kjrBfxLe0yM7g0soMIYluvqOJtFL5KXuY9ksEnhMC9JLjwTtRFHYzU5KVtM43mQNToVScT4no8emWMdvq7CI61UbK+EmYv3ke5puXmK1N0YfuVaLsmm4xtymQbA3mCoJJgGnthCWbx4JAHPXNXtntB/SGDolX1M15e45x8o6K3vV1EKsl2xTbg+ZXX/sXs4O1MHEAqdz5SAVC+49rKgQVIAdIN3yYIo8+JcF9V2KhH3qAt9moqeKgXpu8Q+M+DTQ8h4Kdiie3EhuxwVcb39Qgf/iHG7jRuGjevpsMGNCe3UA1qVjtOPuV7XQjZv3Hnrqe/Z96UHj1uBOCRMU+/JzvgfeWjcmc2KiGSukRDyr3yaL5x+zB8c54SqqVV8lXNXYLtSEuAZFs2W6TO4Ak/6s0iCY9JDIk/zmmd104d2nvgcoe325fMg== X-MS-TrafficTypeDiagnostic: AM7PR03MB6450:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vSFWkJJ6hdikaQ+b2LkyO9IUXLNNjjnOG2qn2opWkNGUoSOjN0KadYAkyvp1XxRvkQ7jZmKMlRhbFawkEMHsHXXOUoRjrU8vNVxp3RI7+p5VAS0K7o6RLotCHrdi+6ObBt70jAAA+h0hj+RYxOxwnXUE/YyJgXofoAlIDeg+zdpBgNSr5hf6qOTGpWeG6SeRnbf/pFXpYESkt5/xaZDfWOnhfbx4l+Lw2mv9iQN8gdKcpnI5kS45kQOiq5F09hW2zb0q8YbluWkdtUR+28t+PVcfZ6ob/oD2IKPQSecHqS45D0T8yHLbQMvXnkfcSPE1EautYqFvsDu4mZ4JVbqu+0ek6HrQr9eYcnbqETqs50WevxOgQOi6zAND/9E4tiNDTZDomDEWZArIymN4q7wBEIrBZ6mCXyQZlrpfzlsP2TiXyX8MtEr1TmcYbj8zpgkz6bmszp4JqQmg3dcGPFwhjaVK6s+48ENEYKxDLjNVwKnRBO7fUSD71j0kM+JLfVox45wGMy7DZl0aWGSfqYVy3vShG2CZ+tKlZOKlAKBUPVSOFOfQIGzG6heJIRm4UNtKVpd/k0nqAFVGX4q9dZivig== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: P80PccgtHoM0zbubmP8qyrxDzI6c/rGxATXdKhmAZr09OG9y7nvQGJE8xxCOa5C95JJf2+KZQYMzYFeBZcyInwx4tbNcr/63X4OUfoFIpaCQE07kw6coCBxKiOIW8usIxB/x/IrimYE10fiHIL7T6cpEbUeIPqeu0rZlkTTu523stFOdUjsj/deOcgiL3jLUVFjWnayXAoda1evfo8WhjhHOV05pckRgpqIbj4kdqzYzhxSk6YCj2lPHte90GHxEPrKC5ZHVT8Dpx4yQ0J14BRo+HpOu6zk3ySNYT/nWPMO9rw3YKUPX5394Di6JERwEqzToDfPAviSsWod7BiFfUQgVOyC+buc3yLg8r91jX7socmsL8VHEBGg7ojM+nJtBOSOYmr2l02UbD1SrZSn3CoI7VVGsw1IK6yFQEDCbuVoJHSW2eDuQkYaKdIUjlC+iMP9EN0oqomx2jmctm1m6cyhebdT05MnGPT2TPi6kYpwiWJ1LOjgpP/ZeFFOSEV4QQXaf61kRdjnBXfvQh22uCJu5UdIy1bS3MA2BRgRDTABIiqcP9TCkUH7xQQDJR98dzh05LVVLgpfuv8mvJnUC1RCfvWz1I3iGvmwFc8HHLkSt9SiDr/B0poGD3+k9KH99Egx1qlgyaC0R09T6SpBduuopRPEn6B4/TlxevVJth9EiYYgX117FKTPzhb4cBpjjC9prXKygikRvl/kH1oN2K+Voyhhx+YJ42vea/KZZOYJZJY58plkNIDWWuKCdvnr3VILelzT/Bsy5aPErXmsE1jd4X/HTsAZk9THCA8mIr9KEPfZXkWdHIbV6K1ysV4KIyYvgstY4a1ssjMrTSspTaQ9lcHmiZd2jwbPNPQnxTTTVkUCZw5uIdQlbgZXKsg3x7nXkBUOkMenFhgYA8JJ2DW7XK9HLeK1a8cPYmV+Rf54jGOhFSw14cw5jTTCC/qaGkDB4b9eoha/ngWRTjKoVLg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd91227f-b845-4ac1-b0a8-08d9bcd5b8af X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2021 18:40:36.3931 (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: AM7PR03MB6450 Subject: [FFmpeg-devel] [PATCH 03/12] avformat/demux: Remove fake-loop 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: C/p/gpj8RR0x When flushing, try_decode_frame() itself loops until the desired properties have been found or the decoder is drained. Signed-off-by: Andreas Rheinhardt --- libavformat/demux.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 745dc8687c..87dbd53a0f 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -2771,11 +2771,9 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) /* flush the decoders */ if (sti->info->found_decoder == 1) { - do { - err = try_decode_frame(ic, st, empty_pkt, - (options && i < orig_nb_streams) - ? &options[i] : NULL); - } while (err > 0 && !has_codec_parameters(st, NULL)); + err = try_decode_frame(ic, st, empty_pkt, + (options && i < orig_nb_streams) + ? &options[i] : NULL); if (err < 0) { av_log(ic, AV_LOG_INFO,