From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 17/22] fftools/ffmpeg_filter: only flush vsync code if encoding actually started
Date: Fri, 7 Jul 2023 11:48:42 +0200
Message-ID: <20230707094847.25324-17-anton@khirnov.net> (raw)
In-Reply-To: <20230707094847.25324-1-anton@khirnov.net>
Otherwise this has no effect.
Will be useful in following commits.
---
fftools/ffmpeg_filter.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index f8e64ce6cc..4955fe38dd 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -1720,10 +1720,10 @@ int reap_filters(int flush)
if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
av_log(fgp, AV_LOG_WARNING,
"Error in av_buffersink_get_frame_flags(): %s\n", av_err2str(ret));
- } else if (flush && ret == AVERROR_EOF) {
- if (av_buffersink_get_type(filter) == AVMEDIA_TYPE_VIDEO)
- enc_frame(ost, NULL);
- }
+ } else if (flush && ret == AVERROR_EOF && ofp->got_frame &&
+ av_buffersink_get_type(filter) == AVMEDIA_TYPE_VIDEO)
+ enc_frame(ost, NULL);
+
break;
}
if (ost->finished) {
--
2.40.1
_______________________________________________
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".
next prev parent reply other threads:[~2023-07-07 9:52 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-07 9:48 [FFmpeg-devel] [PATCH 01/22] lavc/encode: print separate messages for unknown and unsupported formats Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 02/22] lavc/encode: shorten code by using a local variable Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 03/22] lavc/encoder: always print an error on an unsupported channel layout Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 04/22] lavc/encode: improve input sample rate validation Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 05/22] lavc/encode: improve unsupported-format error messages Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 06/22] lavfi: make sure frame SAR matches the link value Anton Khirnov
2023-07-15 21:10 ` Michael Niedermayer
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 07/22] fftools/ffmpeg_filter: make sure no input or output is bound twice Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 08/22] fftools/ffmpeg_filter: make OutputFile.format/sample_rate private Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 09/22] fftools/ffmpeg_filter: make OutputFile.ch_layout private Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 10/22] fftools/ffmpeg_filter: make OutputFile.width, height private Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 11/22] fftools/ffmpeg_filter: make OutputFile.{formats, ch_layouts, sample_rates} private Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 12/22] fftools/ffmpeg_filter: consolidate calling avfilter_graph_set_auto_convert() Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 13/22] fftools/ffmpeg_filter: stop disregarding user-specified pixel format Anton Khirnov
2023-07-08 22:15 ` Michael Niedermayer
2023-07-09 2:18 ` Anton Khirnov
2023-07-08 22:51 ` Michael Niedermayer
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 14/22] fftools/ffmpeg_filter: stop accessing encoder from pixfmt selection Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 15/22] fftools/ffmpeg: drop an obsolete debug log Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 16/22] fftools/ffmpeg: rework initializing encoders with no frames Anton Khirnov
2023-07-07 9:48 ` Anton Khirnov [this message]
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 18/22] fftools/ffmpeg_enc: initialize audio/video encoders from frame parameters Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 19/22] fftools/ffmpeg_filter: make OutputFilter.filter private Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 20/22] fftools/ffmpeg: add more structure to FrameData Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 21/22] fftools/ffmpeg: rework -enc_time_base handling Anton Khirnov
2023-07-07 9:48 ` [FFmpeg-devel] [PATCH 22/22] doc/ffmpeg: fix -enc_time_base documentation Anton Khirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230707094847.25324-17-anton@khirnov.net \
--to=anton@khirnov.net \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git