[FFmpeg-cvslog] avformat/mux: Only write HEADER marker if format has .write_header

Andreas Rheinhardt git at videolan.org
Thu Sep 7 02:19:19 EEST 2023


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Sep  2 15:06:44 2023 +0200| [5869407da2657900ebf7419a4dff85b309e2363e] | committer: Andreas Rheinhardt

avformat/mux: Only write HEADER marker if format has .write_header

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5869407da2657900ebf7419a4dff85b309e2363e
---

 libavformat/mux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index fff8094341..0cf9ebfc19 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -464,9 +464,9 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
         if ((ret = avformat_init_output(s, options)) < 0)
             return ret;
 
-    if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
-        avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_HEADER);
     if (ffofmt(s->oformat)->write_header) {
+        if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
+            avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_HEADER);
         ret = ffofmt(s->oformat)->write_header(s);
         if (ret >= 0 && s->pb && s->pb->error < 0)
             ret = s->pb->error;



More information about the ffmpeg-cvslog mailing list