Commit 1743871a authored by bcoudurier's avatar bcoudurier

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

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17936 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 1e3a2d6c
......@@ -922,7 +922,7 @@ static int mov_write_hdlr_tag(ByteIOContext *pb, MOVTrack *track)
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(ByteIOContext *pb, MOVTrack *track)
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 ? */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment