diff options
| author | Martin Storsjö <martin@martin.st> | 2014-10-30 09:35:10 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-10-30 23:16:56 +0200 |
| commit | c55d1d382cd41345a79782ace41f9b43f45dca9a (patch) | |
| tree | 5949d6b5cb296d0916a26e682e9970b03f033ed1 /libavformat/movenc.c | |
| parent | 00c67fe1d0bc7c2ce49daac9c80ea39d5a663b73 (diff) | |
| download | ffmpeg-c55d1d382cd41345a79782ace41f9b43f45dca9a.tar.gz | |
movenc: Don't write any tfdt atom for ismv files
The tfdt atom shouldn't be needed in those cases, we already
write tfxd atoms for ismv anyway, which is roughly equivalent.
This avoids having to declare the iso6 brand for ismv files.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 6184101eee..d79607b3b8 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2583,7 +2583,8 @@ static int mov_write_traf_tag(AVIOContext *pb, MOVMuxContext *mov, ffio_wfourcc(pb, "traf"); mov_write_tfhd_tag(pb, mov, track, moof_offset); - mov_write_tfdt_tag(pb, track); + if (mov->mode != MODE_ISM) + mov_write_tfdt_tag(pb, track); mov_write_trun_tag(pb, mov, track, moof_size); if (mov->mode == MODE_ISM) { mov_write_tfxd_tag(pb, track); @@ -2758,7 +2759,7 @@ static int mov_write_ftyp_tag(AVIOContext *pb, AVFormatContext *s) // We add tfdt atoms when fragmenting, signal this with the iso6 compatible // brand. This is compatible with users that don't understand tfdt. - if (mov->flags & FF_MOV_FLAG_FRAGMENT) + if (mov->flags & FF_MOV_FLAG_FRAGMENT && mov->mode != MODE_ISM) ffio_wfourcc(pb, "iso6"); if (mov->mode == MODE_3GP) |