MOV: Add several iTunes metadata tags

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20586 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0934b836fd502924977b5c242e65f081dee553df..21ef770f82fe9c0247f3ebc326359aa969c0ba7b 100644 (file)
--- 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 eb57d1433c888de3a1d070fe52448c63046b8031..ac6378c10bc2cbe70ff4a4c7a28a02ffcf565eaa 100644 (file)
--- 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);
 }