Moves the display of metadata to dump_format()

[ffmpeg] / libavformat / metadata_compat.c

diff --git a/libavformat/metadata_compat.c b/libavformat/metadata_compat.c
index ab03826d539fd3cd3706d59141765a143618e756..b05fb04bce69edb5b7ed71571bbf83b3d91d9ae5 100644 (file)
--- a/libavformat/metadata_compat.c
+++ b/libavformat/metadata_compat.c
@@ -18,12 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-
 #include <strings.h>
+#include "avformat.h"
 #include "metadata.h"
 #include "libavutil/avstring.h"
 
+#if LIBAVFORMAT_VERSION_MAJOR < 53
+
 #define SIZE_OFFSET(x) sizeof(((AVFormatContext*)0)->x),offsetof(AVFormatContext,x)
 
 static const struct {
@@ -104,9 +105,8 @@ void ff_metadata_demux_compat(AVFormatContext *ctx)
 
 
 #define FILL_METADATA(s, key, value) {                                        \
-    if (value && *value &&                                                    \
-        !av_metadata_get(s->metadata, #key, NULL, AV_METADATA_IGNORE_CASE))   \
-        av_metadata_set(&s->metadata, (const AVMetadataTag){#key, value});    \
+    if (value && *value && !av_metadata_get(s->metadata, #key, NULL, 0))      \
+        av_metadata_set(&s->metadata, #key, value);                           \
     }
 #define FILL_METADATA_STR(s, key)  FILL_METADATA(s, key, s->key)
 #define FILL_METADATA_INT(s, key) {                                           \
@@ -114,10 +114,13 @@ void ff_metadata_demux_compat(AVFormatContext *ctx)
     snprintf(number, sizeof(number), "%d", s->key);                           \
     if(s->key)  FILL_METADATA(s, key, number) }
 
-void ff_metadata_sync_compat(AVFormatContext *ctx)
+void ff_metadata_mux_compat(AVFormatContext *ctx)
 {
     int i;
 
+    if (ctx->metadata && ctx->metadata->count > 0)
+        return;
+
     FILL_METADATA_STR(ctx, title);
     FILL_METADATA_STR(ctx, author);
     FILL_METADATA_STR(ctx, copyright);