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

[bcoudurier]

Author: bcoudurier
Date: Wed Mar 11 09:01:39 2009
New Revision: 17936

Log:
write correct atoms based on tag and not format, fixes subs stream copy

Modified:
   trunk/libavformat/movenc.c

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	Wed Mar 11 08:59:38 2009	(r17935)
+++ trunk/libavformat/movenc.c	Wed Mar 11 09:01:39 2009	(r17936)
@@ -922,7 +922,7 @@ static int mov_write_hdlr_tag(ByteIOCont
             hdlr_type = "soun";
             descr = "SoundHandler";
         } else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) {
-            if (track->mode == MODE_IPOD) hdlr_type = "sbtl";
+            if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl";
             else                          hdlr_type = "text";
             descr = "SubtitleHandler";
         }
@@ -951,7 +951,7 @@ static int mov_write_minf_tag(ByteIOCont
     else if (track->enc->codec_type == CODEC_TYPE_AUDIO)
         mov_write_smhd_tag(pb);
     else if (track->enc->codec_type == CODEC_TYPE_SUBTITLE) {
-        if (track->mode == MODE_MOV) mov_write_gmhd_tag(pb);
+        if (track->tag == MKTAG('t','e','x','t')) mov_write_gmhd_tag(pb);
         else                         mov_write_nmhd_tag(pb);
     }
     if (track->mode == MODE_MOV) /* FIXME: Why do it for MODE_MOV only ? */