mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-26 09:07:30 +09:00
Merge remote-tracking branch 'origin/tracking' into custom
This commit is contained in:
commit
52f164545b
1 changed files with 2 additions and 1 deletions
|
|
@ -385,6 +385,7 @@ status_t SampleTable::setTimeToSampleParams(
|
|||
// contains signed values, however some software creates version 0 files that
|
||||
// contain signed values, so we're always treating the values as signed,
|
||||
// regardless of version.
|
||||
// We do the same with ctts flags to work around encoder software issues.
|
||||
status_t SampleTable::setCompositionTimeToSampleParams(
|
||||
off64_t data_offset, size_t data_size) {
|
||||
ALOGV("There are reordered frames present.");
|
||||
|
|
@ -406,7 +407,7 @@ status_t SampleTable::setCompositionTimeToSampleParams(
|
|||
uint32_t version = flags >> 24;
|
||||
flags &= 0xffffff;
|
||||
|
||||
if ((version != 0 && version != 1) || flags > 1) {
|
||||
if ((version != 0 && version != 1) || (flags != 0 && flags != 1)) {
|
||||
// Expected version = 0 or 1, flags = 0 or 1.
|
||||
return ERROR_MALFORMED;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue