From e2829a8175de8a2c64b45c70e21f46ec528eea99 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 9 Dec 2014 02:57:01 +0100
Subject: [PATCH] avformat/mov: Disable XMP metadata by default
This was suggested by cbsrobot, ubitux and koda
There are files with huge amounts of XMP data, which would otherwise
be displayed in the terminal output of FFmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
RELEASE_NOTES | 2 ++
libavformat/mov.c | 2 +-
libavformat/version.h | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index a1ddd35dbf..7362561a00 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -97,3 +97,5 @@
┌────────────────────────────┐
│ ⚠ Behaviour changes │
└────────────────────────────┘
+ • XMP metadata is not exported by default anymore as it can be huge.
+ see the export_xmp option
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6c5fc74c91..6641d35443 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4239,7 +4239,7 @@ static const AVOption mov_options[] = {
{ "export_all", "Export unrecognized metadata entries", OFFSET(export_all),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = FLAGS },
{ "export_xmp", "Export full XMP metadata", OFFSET(export_xmp),
- AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, .flags = FLAGS },
+ AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = FLAGS },
{ NULL },
};
diff --git a/libavformat/version.h b/libavformat/version.h
index f3de8ac6ad..5e73353d31 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 56
#define LIBAVFORMAT_VERSION_MINOR 15
-#define LIBAVFORMAT_VERSION_MICRO 103
+#define LIBAVFORMAT_VERSION_MICRO 104
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \