Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix making MP4 file when forcing index pos

This commit is contained in:
Martchus 2016-11-19 21:25:18 +01:00
parent d7ca2a0cd4
commit 56e49e11fc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mp4/mp4container.cpp
View File

@ -239,7 +239,8 @@ void Mp4Container::internalMakeFile()
// -> whether rewrite is required (always required when forced to rewrite or when tracks have been altered)
bool rewriteRequired = fileInfo().isForcingRewrite() || writeChunkByChunk;
// -> use the preferred tag position/index position (force one wins, if both are force tag pos wins; might be changed later if none is forced)
ElementPosition newTagPos = fileInfo().forceTagPosition() || !fileInfo().forceIndexPosition() ? fileInfo().tagPosition() : fileInfo().indexPosition();
const ElementPosition initialNewTagPos = fileInfo().forceTagPosition() || !fileInfo().forceIndexPosition() ? fileInfo().tagPosition() : fileInfo().indexPosition();
ElementPosition newTagPos = initialNewTagPos;
// -> current tag position (determined later)
ElementPosition currentTagPos;
// -> holds new padding (before actual data)
@ -488,7 +489,7 @@ calculatePadding:
} else {
// writing tag before media data is forced -> rewrite the file
// when rewriting anyways, ensure the preferred tag position is used
newTagPos = fileInfo().tagPosition() == ElementPosition::Keep ? currentTagPos : fileInfo().tagPosition();
newTagPos = initialNewTagPos == ElementPosition::Keep ? currentTagPos : initialNewTagPos;
}
// in any case: recalculate padding
goto calculatePadding;