diff options
| author | Martin Storsjö <martin@martin.st> | 2014-10-29 23:26:40 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-11-07 13:46:19 +0200 |
| commit | e7d20f12c5eff5570cd897f3ce3a88456024036b (patch) | |
| tree | 87908fc5a58b36880271847f77d6a1e4bb89a498 /libavformat | |
| parent | 1d8a0c1b43e58332a3a15c67d4adc161713cade8 (diff) | |
| download | ffmpeg-e7d20f12c5eff5570cd897f3ce3a88456024036b.tar.gz | |
movenc: Remove a now redundant check
When using the new first_trun flag instead of checking the track id,
we don't need to have a special case for the separate_moof flag
any longer.
This simplifies the complicated codepath ever so slightly.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7a0d9f1150..96bb8851a0 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2473,7 +2473,7 @@ static int mov_write_trun_tag(AVIOContext *pb, MOVMuxContext *mov, avio_wb32(pb, track->entry); /* sample count */ if (mov->flags & FF_MOV_FLAG_OMIT_TFHD_OFFSET && - !(mov->flags & (FF_MOV_FLAG_SEPARATE_MOOF | FF_MOV_FLAG_DEFAULT_BASE_MOOF)) && + !(mov->flags & FF_MOV_FLAG_DEFAULT_BASE_MOOF) && !mov->first_trun) avio_wb32(pb, 0); /* Later tracks follow immediately after the previous one */ else |