Merge commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b'

* commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b': movenc: Remove a now redundant check Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 872c0bcd3c
parent 2893d1b36d e7d20f12c5
commit 872c0bcd3c
1 changed files with 1 additions and 1 deletions
--- 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