aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Conrad <lessen42@gmail.com>2009-11-23 08:47:44 +0000
committerDavid Conrad <lessen42@gmail.com>2009-11-23 08:47:44 +0000
commit7382902b8654356248cc5d1887a361d7febd878c (patch)
tree4934b6d57183b21c34b98e8d9c87b6d33fceee47
parent620af1a17a7cc8de54f8ff0eaa537cd5b9ba34b9 (diff)
downloadffmpeg-7382902b8654356248cc5d1887a361d7febd878c.tar.gz
MOV: Add several iTunes metadata tags
Originally committed as revision 20586 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mov.c5
-rw-r--r--libavformat/movenc.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0934b836fd..21ef770f82 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -116,6 +116,11 @@ static int mov_read_udta_string(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
case MKTAG(0xa9,'g','e','n'): key = "genre"; break;
case MKTAG(0xa9,'t','o','o'):
case MKTAG(0xa9,'e','n','c'): key = "encoder"; break;
+ case MKTAG( 'd','e','s','c'): key = "description";break;
+ case MKTAG( 'l','d','e','s'): key = "synopsis"; break;
+ case MKTAG( 't','v','s','h'): key = "show"; break;
+ case MKTAG( 't','v','e','n'): key = "episode_id";break;
+ case MKTAG( 't','v','n','n'): key = "network"; break;
case MKTAG( 't','r','k','n'): key = "track";
parse = mov_metadata_trkn; break;
}
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index eb57d1433c..ac6378c10b 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1377,6 +1377,11 @@ static int mov_write_ilst_tag(ByteIOContext *pb, MOVMuxContext *mov,
mov_write_string_metadata(s, pb, "\251cmt", "comment" , 1);
mov_write_string_metadata(s, pb, "\251gen", "genre" , 1);
mov_write_string_metadata(s, pb, "\251cpy", "copyright", 1);
+ mov_write_string_metadata(s, pb, "desc", "description",1);
+ mov_write_string_metadata(s, pb, "ldes", "synopsis" , 1);
+ mov_write_string_metadata(s, pb, "tvsh", "show" , 1);
+ mov_write_string_metadata(s, pb, "tven", "episode_id",1);
+ mov_write_string_metadata(s, pb, "tvnn", "network" , 1);
mov_write_trkn_tag(pb, mov, s);
return updateSize(pb, pos);
}