diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-23 20:33:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-23 20:33:09 +0100 |
| commit | ad3c5ff347a88e6a3409cee83b6e92d453e5023e (patch) | |
| tree | 78c48e1e50a5891d63dfefd0e1c17b8526446e3b /libavformat | |
| parent | 67ceb42d394bcff0fd25e4e76f1a606d105334cc (diff) | |
| parent | e0046bc9c96150fa06146ace9093f06857dd7b23 (diff) | |
| download | ffmpeg-ad3c5ff347a88e6a3409cee83b6e92d453e5023e.tar.gz | |
Merge commit 'e0046bc9c96150fa06146ace9093f06857dd7b23'
* commit 'e0046bc9c96150fa06146ace9093f06857dd7b23':
movenc: Write the make and model metadata keys for mov style files
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a9e1a23f4c..b6821d447c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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, "\251gen", "genre", 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"); } else { /* iTunes meta data */ |