diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-05-23 21:03:14 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2010-05-23 21:03:14 +0000 |
| commit | ea4c4d7fe395c6202a83ad36547e58abdfe8263e (patch) | |
| tree | 7a52d525b6c8ace92992c1c68d6abfc5bc0949b8 | |
| parent | e53ca636d90e4484361dfea7e3017b9697725a00 (diff) | |
| download | ffmpeg-ea4c4d7fe395c6202a83ad36547e58abdfe8263e.tar.gz | |
change author metadata to artist in mov de/muxer
Originally committed as revision 23266 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avformat.h | 14 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 | ||||
| -rw-r--r-- | libavformat/movenc.c | 2 |
3 files changed, 15 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 91d69117f7..a8e4408b82 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, \ @@ -169,6 +169,18 @@ void av_metadata_conv(struct AVFormatContext *ctx,const AVMetadataConv *d_conv, const AVMetadataConv *s_conv); /** + * Converts metadata set according to the given conversion tables + * @param out converted destination metadata + * @param in metadata to be converted + * @param d_conv destination tags format conversion table + * @param s_conv source tags format conversion table + */ +void av_metadata_conv_generic(AVMetadata **out, + AVMetadata *in, + const AVMetadataConv *d_conv, + const AVMetadataConv *s_conv); + +/** * Frees all the memory allocated for an AVMetadata struct. */ void av_metadata_free(AVMetadata **m); 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); |