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 02C8942943 for ; Wed, 6 Apr 2022 11:21:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 762F768B267; Wed, 6 Apr 2022 14:21:06 +0300 (EEST) Received: from mail-oa1-f42.google.com (mail-oa1-f42.google.com [209.85.160.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5120768B21F for ; Wed, 6 Apr 2022 14:21:00 +0300 (EEST) Received: by mail-oa1-f42.google.com with SMTP id 586e51a60fabf-e1dcc0a327so2556330fac.1 for ; Wed, 06 Apr 2022 04:21:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=kEWcWvrR0K6j5sF78kVjBT+DC2hNErn8P0cmipP9C/Y=; b=EpjK42UZNrQJQI8nWHLBm0Ve0VpxNNotbmRW9MKE1OOILyzOqpiwzi9fwokLpeKOWR aFWAwW5zghnhi+rY8PiiaK8+3lluCTIsLND0CKivVkNKShG7CjD2jalaUaZ/WbcjXGtq HRQswqHGYcM7emJmrldZAn7JC0FzGkW1J9bncmYDKHc0ValfZmR6KLKOnEUwlepHcZ+x 8VPzw1uu1O9tSHMY8JfkV5mLDVInXE1WalpmdDhCfdP8Yw+Y9yuhHGevFSfesJYeiBSS SyJhxp4KYHXjYdMXXIN/KFDmdLLptGNo1RabGgRTeA2w0daPlw8DyTi9ptbLcaE+4bkj jGQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=kEWcWvrR0K6j5sF78kVjBT+DC2hNErn8P0cmipP9C/Y=; b=QZVa82ndrvpo3lojcRLCyZT+W2RyShU67oScI7kr2LPaw9r+JA3Jt2YtshcJroCYgS L+I29N6fEcujVOEmVFbzPoEcwMXl3BblAscBidLbqs8Dwln6u2h9MPVrPjc/F0ifETL9 gIccMjCJpaFut5Tn6GcSgaya7eUEfLxtGQiP8tzzcJtupunUb3q5u/riHT0PmkwWJpbo i0+tyDj8QfT6AnyKxQGDbPomDv+0OngsYRZBeizKQQUoRL4xf3AV1cSMUyGMSP1qk1A0 Pxp+hyt5+NS2VHGKo9v0IYWE6iqKX4hmI9lC/pcFfXN2ejdsOlmuCs0OumGwnyVGIm3m tzBA== X-Gm-Message-State: AOAM530QZqpLwoeQOIswZ/geHMnf7rLTc1pD1dcZIaVWZQaNKfvupmec oftaakPJpRWWH0qlarbiVxGcUELz5GUPTw== X-Google-Smtp-Source: ABdhPJy4hSyG77FJqlKJd+YmJz5qSBpJOTi5/F298MknXchyUX4tVr1vnn3mw4nVG0P+j180Ju9Ifw== X-Received: by 2002:a05:6870:508:b0:ce:c0c9:5f1 with SMTP id j8-20020a056870050800b000cec0c905f1mr3676641oao.67.1649244058590; Wed, 06 Apr 2022 04:20:58 -0700 (PDT) Received: from [192.168.0.12] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id 12-20020a05687012cc00b000de97cc1beesm6553514oam.43.2022.04.06.04.20.57 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 Apr 2022 04:20:58 -0700 (PDT) Message-ID: Date: Wed, 6 Apr 2022 08:20:56 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220404113037.13070-1-anton@khirnov.net> <20220404113037.13070-3-anton@khirnov.net> From: James Almer In-Reply-To: <20220404113037.13070-3-anton@khirnov.net> Subject: Re: [FFmpeg-devel] [PATCH 02/49] fftools/ffmpeg: move a comment to a more appropriate place 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 4/4/2022 8:29 AM, Anton Khirnov wrote: > --- > fftools/ffmpeg.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c > index afa1b012a6..13be32f0cf 100644 > --- a/fftools/ffmpeg.c > +++ b/fftools/ffmpeg.c > @@ -1238,6 +1238,11 @@ static void do_video_out(OutputFile *of, > } > } > > + /* > + * For video, number of frames in == number of packets out. > + * But there may be reordering, so we can't throw away frames on encoder > + * flush, we need to limit them here, before they go into encoder. > + */ > nb_frames = FFMIN(nb_frames, ost->max_frames - ost->frame_number); > nb0_frames = FFMIN(nb0_frames, nb_frames); > > @@ -1392,11 +1397,6 @@ static void do_video_out(OutputFile *of, > } > } > ost->sync_opts++; > - /* > - * For video, number of frames in == number of packets out. > - * But there may be reordering, so we can't throw away frames on encoder > - * flush, we need to limit them here, before they go into encoder. > - */ > ost->frame_number++; > > if (vstats_filename && frame_size) Patches 1 and 2 are trivial and lgtm. _______________________________________________ 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".