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

fixed infinite loop

This commit is contained in:
Martchus 2016-01-16 16:47:18 +01:00
parent 9598ae1f7f
commit de104dee5a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mp4/mp4container.cpp
View File

@ -458,12 +458,15 @@ calculatePadding:
}
if(rewriteRequired) {
// can't put the tags before media data
if(!firstMovieFragmentAtom && (!fileInfo().forceTagPosition() || newTagPos == ElementPosition::Keep)) {
// writing tag before media data is not forced -> just put the tags at the end
if(!firstMovieFragmentAtom && !fileInfo().forceTagPosition() && newTagPos != ElementPosition::AfterData) {
// writing tag before media data is not forced, its not a DASH file and tags aren't already at the end
// -> try to put the tags at the end
newTagPos = ElementPosition::AfterData;
rewriteRequired = false;
} 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();
}
// in any case: recalculate padding
goto calculatePadding;