[FFmpeg-cvslog] fftools/ffmpeg_mux_init: remove a redundant check

Anton Khirnov git at videolan.org
Mon Apr 17 13:07:04 EEST 2023


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon Apr 10 21:42:48 2023 +0200| [a0452ee83750afe0e279d3cbe7a678e2a72f93b4] | committer: Anton Khirnov

fftools/ffmpeg_mux_init: remove a redundant check

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

 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 c16967cea8..74f0d5f56b 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



More information about the ffmpeg-cvslog mailing list