diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 00:32:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-08 00:32:52 +0100 |
| commit | 872c0bcd3c04802f97cf08235aa1544f33e46821 (patch) | |
| tree | abcb6d79371d548cb9b92a710d35778bc5909ad4 /libavformat | |
| parent | 2893d1b36d17f4a244ce84311b0ace541c7e1593 (diff) | |
| parent | e7d20f12c5eff5570cd897f3ce3a88456024036b (diff) | |
| download | ffmpeg-872c0bcd3c04802f97cf08235aa1544f33e46821.tar.gz | |
Merge commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b'
* commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b':
movenc: Remove a now redundant check
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 63785e0a64..f3b99a1f6c 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3201,7 +3201,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 |