[FFmpeg-cvslog] avformat/mux: Remove check for AVFMT_ALLOW_FLUSH
Andreas Rheinhardt
git at videolan.org
Tue Mar 26 07:44:10 EET 2024
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Mar 23 00:57:32 2024 +0100| [a990e6fa01cb4436e26d0aa628307305cd475bef] | committer: Andreas Rheinhardt
avformat/mux: Remove check for AVFMT_ALLOW_FLUSH
Due to the bump it is now certain that all devices
that support flushing have the proper internal flag set.
(Notice that the check for LIBAVFORMAT_VERSION was wrong.)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a990e6fa01cb4436e26d0aa628307305cd475bef
---
libavformat/mux.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/libavformat/mux.c b/libavformat/mux.c
index f23eb0188d..630204a8ec 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -1236,13 +1236,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *in)
int ret;
if (!in) {
-#if FF_API_ALLOW_FLUSH || LIBAVFORMAT_VERSION_MAJOR >= 61
- // Hint: The pulse audio output device has this set,
- // so we can't switch the check to FF_OFMT_FLAG_ALLOW_FLUSH immediately.
- if (s->oformat->flags & AVFMT_ALLOW_FLUSH) {
-#else
if (ffofmt(s->oformat)->flags_internal & FF_OFMT_FLAG_ALLOW_FLUSH) {
-#endif
ret = ffofmt(s->oformat)->write_packet(s, NULL);
flush_if_needed(s);
if (ret >= 0 && s->pb && s->pb->error < 0)
More information about the ffmpeg-cvslog
mailing list