# HG changeset patch # User bcoudurier # Date 1236758499 0 # Node ID 59ee17ee14faca21a51e090868411a327710710d # Parent 3c93138ca17b316d322d8e5b9f09f4ee7f178f3d write correct atoms based on tag and not format, fixes subs stream copy diff -r 3c93138ca17b -r 59ee17ee14fa movenc.c --- a/movenc.c Wed Mar 11 07:59:38 2009 +0000 +++ b/movenc.c Wed Mar 11 08:01:39 2009 +0000 @@ -922,7 +922,7 @@ 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 @@ 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 ? */