ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Dec 9 02:57:01 2014 +0100| [e2829a8175de8a2c64b45c70e21f46ec528eea99] | committer: Michael Niedermayer
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 <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e2829a8175de8a2c64b45c70e21f46ec528eea99 --- 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 a1ddd35..7362561 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 6c5fc74..6641d35 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 f3de8ac..5e73353 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, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
