Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Anton Khirnov <anton@khirnov.net>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH 04/25] fftools/ffmpeg_mux_init: remove a redundant check
Date: Thu, 13 Apr 2023 16:12:02 +0200
Message-ID: <20230413141223.17245-4-anton@khirnov.net> (raw)
In-Reply-To: <20230413141223.17245-1-anton@khirnov.net>

---
 fftools/ffmpeg_mux_init.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index 06a6b3fd2d..e3d66b9897 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -917,18 +917,16 @@ static int streamcopy_init(const Muxer *mux, const OptionsContext *o,
         }
     }
 
-    if (ist->st->nb_side_data) {
-        for (int i = 0; i < ist->st->nb_side_data; i++) {
-            const AVPacketSideData *sd_src = &ist->st->side_data[i];
-            uint8_t *dst_data;
-
-            dst_data = av_stream_new_side_data(ost->st, sd_src->type, sd_src->size);
-            if (!dst_data) {
-                ret = AVERROR(ENOMEM);
-                goto fail;
-            }
-            memcpy(dst_data, sd_src->data, sd_src->size);
+    for (int i = 0; i < ist->st->nb_side_data; i++) {
+        const AVPacketSideData *sd_src = &ist->st->side_data[i];
+        uint8_t *dst_data;
+
+        dst_data = av_stream_new_side_data(ost->st, sd_src->type, sd_src->size);
+        if (!dst_data) {
+            ret = AVERROR(ENOMEM);
+            goto fail;
         }
+        memcpy(dst_data, sd_src->data, sd_src->size);
     }
 
 #if FFMPEG_ROTATION_METADATA
-- 
2.39.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-04-13 14:16 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-13 14:11 [FFmpeg-devel] [PATCH 01/25] fftools/ffmpeg_mux_init: move new_output_stream() lower in the file Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 02/25] fftools/ffmpeg_mux_init: restructure output stream creation Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 03/25] fftools/ffmpeg: move init_output_stream_streamcopy() to ffmpeg_mux_init Anton Khirnov
2023-04-13 14:12 ` Anton Khirnov [this message]
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 05/25] fftools/ffmpeg: move a miplaced assignment Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 06/25] fftools/ffmpeg: move a check to a more appropriate place Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 07/25] fftools/ffmpeg: drop unnecessary indirection Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 08/25] fftools/ffmpeg_mux_init: consolidate input stream flagging code Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 09/25] fftools/ffmpeg: add a function adding a destination filter for InputStream Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 10/25] fftools/ffmpeg: stop setting InputStream fields from muxing/filtering code Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 11/25] fftools/ffmpeg: move opening decoders to a new file Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 12/25] fftools/ffmpeg_dec: reindent after previous commit Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 13/25] fftools/ffmpeg_dec: drop useless abort_codec_experimental() Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 14/25] fftools/ffmpeg: open decoders right after we know they are needed Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 15/25] fftools/ffmpeg: initialize no-filter streams earlier Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 16/25] fftools/ffmpeg: store stream media type in OutputStream Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 17/25] fftools/ffmpeg: add muxer-input codec parameters to OutputStream Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 18/25] fftools/ffmpeg: move do_streamcopy() to ffmpeg_mux Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 19/25] fftools/ffmpeg_mux: use output stream parameters in of_streamcopy() Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 20/25] fftools/ffmpeg_mux: stop using filter_in_rescale_delta_last for streamcopy Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 21/25] fftools/ffmpeg_mux: make ts_copy_start private to muxing code Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 22/25] fftools/ffmpeg_mux: make streamcopy_started " Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 23/25] fftools/ffmpeg_mux: make copy_prior_start " Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 24/25] fftools/ffmpeg_mux: make copy_initial_nonkeyframes " Anton Khirnov
2023-04-13 14:12 ` [FFmpeg-devel] [PATCH 25/25] fftools/ffmpeg_enc: make data_size_enc private to encoding code 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=20230413141223.17245-4-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