[FFmpeg-cvslog] fftools/ffmpeg_mux_init: drop a duplicated block in copy_metadata()

Anton Khirnov git at videolan.org
Wed Nov 16 09:43:44 EET 2022


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Oct 18 12:00:36 2022 +0200| [3c7dd5ed37da6d2de06c4850de5a319ca9cdd47f] | committer: Anton Khirnov

fftools/ffmpeg_mux_init: drop a duplicated block in copy_metadata()

It does the same thing as the block right below it.

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

 fftools/ffmpeg_mux_init.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c
index f40622750f..2fec8f0bc3 100644
--- a/fftools/ffmpeg_mux_init.c
+++ b/fftools/ffmpeg_mux_init.c
@@ -1506,16 +1506,6 @@ static int copy_metadata(const char *outspec, const char *inspec, AVFormatContex
     parse_meta_type(inspec,  &type_in,  &idx_in,  &istream_spec);
     parse_meta_type(outspec, &type_out, &idx_out, &ostream_spec);
 
-    if (!ic) {
-        if (type_out == 'g' || !*outspec)
-            o->metadata_global_manual = 1;
-        if (type_out == 's' || !*outspec)
-            o->metadata_streams_manual = 1;
-        if (type_out == 'c' || !*outspec)
-            o->metadata_chapters_manual = 1;
-        return 0;
-    }
-
     if (type_in == 'g' || type_out == 'g')
         o->metadata_global_manual = 1;
     if (type_in == 's' || type_out == 's')



More information about the ffmpeg-cvslog mailing list