summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2009-02-15 14:13:28 +0000
committerAurelien Jacobs <aurel@gnuage.org>2009-02-15 14:13:28 +0000
commit54b4ea57fdffd147eafafda27d3b46692c3a5a79 (patch)
tree3a0d8f49dfed08403c915c4eb8eef865b31a1769 /libavformat
parent06aae1238f270681b31aecb0fa0ecd90670c1218 (diff)
demux some more metadata tags in mov
Originally committed as revision 17321 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mov.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 4ed656c658..2139f2bd1b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1461,12 +1461,17 @@ 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'):
case MKTAG(0xa9,'w','r','t'): key = "author"; break;
case MKTAG(0xa9,'c','p','y'): key = "copyright"; break;
case MKTAG(0xa9,'c','m','t'):
case MKTAG(0xa9,'i','n','f'): key = "comment"; break;
case MKTAG(0xa9,'a','l','b'): key = "album"; break;
+ case MKTAG(0xa9,'d','a','y'): key = "year"; break;
+ case MKTAG(0xa9,'g','e','n'): key = "genre"; break;
+ case MKTAG(0xa9,'t','o','o'):
+ case MKTAG(0xa9,'e','n','c'): key = "muxer"; break;
}
if (!key)
return 0;
@@ -1842,6 +1847,11 @@ static const MOVParseTableEntry mov_default_parse_table[] = {
{ MKTAG(0xa9,'A','R','T'), mov_read_udta_string },
{ MKTAG(0xa9,'a','l','b'), mov_read_udta_string },
{ MKTAG(0xa9,'c','m','t'), mov_read_udta_string },
+{ MKTAG(0xa9,'a','u','t'), mov_read_udta_string },
+{ MKTAG(0xa9,'d','a','y'), mov_read_udta_string },
+{ MKTAG(0xa9,'g','e','n'), mov_read_udta_string },
+{ MKTAG(0xa9,'e','n','c'), mov_read_udta_string },
+{ MKTAG(0xa9,'t','o','o'), mov_read_udta_string },
{ 0, NULL }
};