diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-11 08:01:39 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2009-03-11 08:01:39 +0000 |
| commit | 9f520554632fdaf00026fdb06791dfecba78bd96 (patch) | |
| tree | 4b480589ce0fd2a1614adb2166d19a1c4cac6111 /libavformat/movenc.c | |
| parent | d1df4da00b106ed642b03ca5abcd653de0d7a5b3 (diff) | |
write correct atoms based on tag and not format, fixes subs stream copy
Originally committed as revision 17936 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index ddc0e29778..a23423fe5b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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 ? */ |