[FFmpeg-cvslog] r13752 - trunk/libavformat/movenc.c

bcoudurier subversion
Thu Jun 12 02:56:54 CEST 2008


Author: bcoudurier
Date: Thu Jun 12 02:56:54 2008
New Revision: 13752

Log:
cosmetics, reindent

Modified:
   trunk/libavformat/movenc.c

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	(original)
+++ trunk/libavformat/movenc.c	Thu Jun 12 02:56:54 2008
@@ -1262,19 +1262,17 @@ static int mov_write_udta_tag(ByteIOCont
             mov_write_3gp_udta_tag(pb, s, "dscp", s->comment);
             mov_write_3gp_udta_tag(pb, s, "albm", s->album);
             mov_write_3gp_udta_tag(pb, s, "yrrc", "nil");
+        } else if (mov->mode == MODE_MOV) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
+            mov_write_string_tag(pb, "\251nam", s->title         , 0);
+            mov_write_string_tag(pb, "\251aut", s->author        , 0);
+            mov_write_string_tag(pb, "\251alb", s->album         , 0);
+            mov_write_day_tag(pb, s->year, 0);
+            mov_write_string_tag(pb, "\251enc", LIBAVFORMAT_IDENT, 0);
+            mov_write_string_tag(pb, "\251des", s->comment       , 0);
+            mov_write_string_tag(pb, "\251gen", s->genre         , 0);
         } else {
-            if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
-                mov_write_string_tag(pb, "\251nam", s->title         , 0);
-                mov_write_string_tag(pb, "\251aut", s->author        , 0);
-                mov_write_string_tag(pb, "\251alb", s->album         , 0);
-                mov_write_day_tag(pb, s->year, 0);
-                mov_write_string_tag(pb, "\251enc", LIBAVFORMAT_IDENT, 0);
-                mov_write_string_tag(pb, "\251des", s->comment       , 0);
-                mov_write_string_tag(pb, "\251gen", s->genre         , 0);
-            } else {
             /* iTunes meta data */
             mov_write_meta_tag(pb, mov, s);
-            }
         }
         return updateSize(pb, pos);
     }




More information about the ffmpeg-cvslog mailing list