diff options
| -rw-r--r-- | libavformat/isom.h | 1 | ||||
| -rw-r--r-- | libavformat/mov.c | 4 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/isom.h b/libavformat/isom.h index 7e60d8c3af..c24b962ae5 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -157,6 +157,7 @@ typedef struct MOVContext { int chapter_track; int64_t next_root_atom; ///< offset of the next root atom int export_all; + int export_xmp; } MOVContext; int ff_mp4_read_descr_len(AVIOContext *pb); diff --git a/libavformat/mov.c b/libavformat/mov.c index 5950c42b67..8124d690b1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -263,6 +263,8 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom) switch (atom.type) { case MKTAG( '@','P','R','M'): key = "premiere_version"; raw = 1; break; case MKTAG( '@','P','R','Q'): key = "quicktime_version"; raw = 1; break; + case MKTAG( 'X','M','P','_'): + if (c->export_xmp) { key = "xmp"; raw = 1; } break; case MKTAG( 'a','A','R','T'): key = "album_artist"; break; case MKTAG( 'c','p','r','t'): key = "copyright"; break; case MKTAG( 'd','e','s','c'): key = "description"; break; @@ -3431,6 +3433,8 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti 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 = 0 }, 0, 1, .flags = FLAGS }, { NULL }, }; diff --git a/libavformat/version.h b/libavformat/version.h index b4d31ddfb2..16c5e2ebec 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 56 #define LIBAVFORMAT_VERSION_MINOR 7 -#define LIBAVFORMAT_VERSION_MICRO 1 +#define LIBAVFORMAT_VERSION_MICRO 2 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |