[FFmpeg-cvslog] r20586 - in trunk/libavformat: mov.c movenc.c

[conrad]

Author: conrad
Date: Mon Nov 23 09:47:44 2009
New Revision: 20586

Log:
MOV: Add several iTunes metadata tags

Modified:
   trunk/libavformat/mov.c
   trunk/libavformat/movenc.c

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	Mon Nov 23 09:47:40 2009	(r20585)
+++ trunk/libavformat/mov.c	Mon Nov 23 09:47:44 2009	(r20586)
@@ -116,6 +116,11 @@ static int mov_read_udta_string(MOVConte
     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;
     }

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	Mon Nov 23 09:47:40 2009	(r20585)
+++ trunk/libavformat/movenc.c	Mon Nov 23 09:47:44 2009	(r20586)
@@ -1377,6 +1377,11 @@ static int mov_write_ilst_tag(ByteIOCont
     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);
 }