Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Subject: [FFmpeg-devel] [PATCH 3/7] avformat/mux: Only write HEADER marker if format has .write_header
Date: Sat,  2 Sep 2023 18:21:37 +0200
Message-ID: <AS8P250MB074454EB3AE45D4E73B63DC98FEBA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB074451A1439E6A39CC721E838FEBA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 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;
-- 
2.34.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".

  parent reply	other threads:[~2023-09-02 16:24 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-02 11:31 [FFmpeg-devel] [PATCH] avformat/avformat: Avoid including codec.h, frame.h Andreas Rheinhardt
2023-09-02 16:21 ` [FFmpeg-devel] [PATCH 2/7] avcodec/defs: Add AV_PROFILE_* defines, deprecate FF_PROFILE_* defines Andreas Rheinhardt
2023-09-02 16:21 ` Andreas Rheinhardt [this message]
2023-09-02 16:21 ` [FFmpeg-devel] [PATCH 4/7] avformat/aviobuf: Add ffio_init_(read|write)_context() Andreas Rheinhardt
2023-09-02 16:21 ` [FFmpeg-devel] [PATCH 5/7] avutil: Move error.h from avutil.h to common.h Andreas Rheinhardt
2023-09-03  7:47   ` Paul B Mahol
2023-09-02 16:21 ` [FFmpeg-devel] [PATCH 6/7] avutil/mem: Don't include avutil.h Andreas Rheinhardt
2023-09-03  7:43   ` Paul B Mahol
2023-09-04 14:05   ` Michael Niedermayer
2023-09-04 14:20     ` Andreas Rheinhardt
2023-09-02 16:21 ` [FFmpeg-devel] [PATCH 7/7] avutil/avstring: Remove obsolete version.h inclusion Andreas Rheinhardt
2023-09-02 23:12 ` [FFmpeg-devel] [PATCH 8/8] all: Replace __FUNCTION__ by __func__ Andreas Rheinhardt
2023-09-02 23:40   ` James Almer
2023-09-03  9:05     ` Andreas Rheinhardt
2023-09-02 23:28 ` [FFmpeg-devel] [PATCH 9/9] avcodec/vp8data: Use <> for inclusion of stdint.h Andreas Rheinhardt
2023-09-03  7:47   ` Paul B Mahol
2023-09-03 14:22 ` [FFmpeg-devel] [PATCH 10/11] avfilter/af_volume: Also deprecate position enum value Andreas Rheinhardt
2023-09-03 14:22 ` [FFmpeg-devel] [PATCH 11/11] avfilter/f_select: Also deprecate "pos" variable name Andreas Rheinhardt
2023-09-04 14:17 ` [FFmpeg-devel] [PATCH v2 6/11] avutil/mem: Don't include avutil.h Andreas Rheinhardt
2023-09-06  9:36 ` [FFmpeg-devel] [PATCH] avformat/avformat: Avoid including codec.h, frame.h Andreas Rheinhardt

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=AS8P250MB074454EB3AE45D4E73B63DC98FEBA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM \
    --to=andreas.rheinhardt@outlook.com \
    --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