Commit ad3c5ff3 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'e0046bc9'

* commit 'e0046bc9':
  movenc: Write the make and model metadata keys for mov style files

Conflicts:
	libavformat/movenc.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 67ceb42d e0046bc9
...@@ -3073,6 +3073,8 @@ static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov, ...@@ -3073,6 +3073,8 @@ static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
mov_write_string_metadata(s, pb_buf, "\251cmt", "comment", 0); mov_write_string_metadata(s, pb_buf, "\251cmt", "comment", 0);
mov_write_string_metadata(s, pb_buf, "\251gen", "genre", 0); mov_write_string_metadata(s, pb_buf, "\251gen", "genre", 0);
mov_write_string_metadata(s, pb_buf, "\251cpy", "copyright", 0); mov_write_string_metadata(s, pb_buf, "\251cpy", "copyright", 0);
mov_write_string_metadata(s, pb_buf, "\251mak", "make", 0);
mov_write_string_metadata(s, pb_buf, "\251mod", "model", 0);
mov_write_raw_metadata_tag(s, pb_buf, "XMP_", "xmp"); mov_write_raw_metadata_tag(s, pb_buf, "XMP_", "xmp");
} else { } else {
/* iTunes meta data */ /* iTunes meta data */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment