diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2010-05-27 20:40:09 +0000 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2010-05-27 20:40:09 +0000 |
| commit | 0078216f0746b7a683805c8305457d73e000cc4d (patch) | |
| tree | 6af007ad6e2ee3e5937839f7a45372303ed2d9e5 | |
| parent | 12ca60ec15b540586dd78c86645b394e7d5a1128 (diff) | |
change author metadata to artist in mov de/muxer
backport r23266 by bcoudurier
Originally committed as revision 23353 to svn://svn.ffmpeg.org/ffmpeg/branches/0.6
| -rw-r--r-- | libavformat/avformat.h | 2 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 | ||||
| -rw-r--r-- | libavformat/movenc.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 48c5061d49..c312d98ab8 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -23,7 +23,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 52 #define LIBAVFORMAT_VERSION_MINOR 64 -#define LIBAVFORMAT_VERSION_MICRO 0 +#define LIBAVFORMAT_VERSION_MICRO 1 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ diff --git a/libavformat/mov.c b/libavformat/mov.c index e37bcf5f57..2edd27e440 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -144,7 +144,7 @@ static int mov_read_udta_string(MOVContext *c, ByteIOContext *pb, MOVAtom atom) switch (atom.type) { case MKTAG(0xa9,'n','a','m'): key = "title"; break; case MKTAG(0xa9,'a','u','t'): - case MKTAG(0xa9,'A','R','T'): key = "author"; break; + case MKTAG(0xa9,'A','R','T'): key = "artist"; break; case MKTAG(0xa9,'w','r','t'): key = "composer"; break; case MKTAG( 'c','p','r','t'): case MKTAG(0xa9,'c','p','y'): key = "copyright"; break; diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 440c98ad26..f4b8e06cea 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1452,7 +1452,7 @@ static int mov_write_ilst_tag(ByteIOContext *pb, MOVMuxContext *mov, put_be32(pb, 0); /* size */ put_tag(pb, "ilst"); mov_write_string_metadata(s, pb, "\251nam", "title" , 1); - mov_write_string_metadata(s, pb, "\251ART", "author" , 1); + mov_write_string_metadata(s, pb, "\251ART", "artist" , 1); mov_write_string_metadata(s, pb, "aART", "album_artist", 1); mov_write_string_metadata(s, pb, "\251wrt", "composer" , 1); mov_write_string_metadata(s, pb, "\251alb", "album" , 1); |