Skip to content

Commit

Permalink
Revert "libavformat/mov.c: increase allowed time error"
Browse files Browse the repository at this point in the history
This reverts commit 346d4dbbf0babc5b5bc4743afd26ee997667ea7c.

from:
changed: allow 4 second skew between streams in mov before attempting to seek e4170c6

No reason given for the change.
  • Loading branch information
ulmus-scott committed Jun 12, 2022
1 parent e4821be commit 706ec00
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions mythtv/external/FFmpeg/libavformat/mov.c
Expand Up @@ -7842,9 +7842,8 @@ static AVIndexEntry *mov_find_next_sample(AVFormatContext *s, AVStream **st)
if (!sample || (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL) && current_sample->pos < sample->pos) ||
((s->pb->seekable & AVIO_SEEKABLE_NORMAL) &&
((msc->pb != s->pb && dts < best_dts) || (msc->pb == s->pb && dts != AV_NOPTS_VALUE &&
/* MythTV change here to use 4*AV_TIME_BASE instead of AV_TIME_BASE */
((FFABS(best_dts - dts) <= 4*AV_TIME_BASE && current_sample->pos < sample->pos) ||
(FFABS(best_dts - dts) > 4*AV_TIME_BASE && dts < best_dts)))))) {
((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) ||
(FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))))) {
sample = current_sample;
best_dts = dts;
*st = avst;
Expand Down

0 comments on commit 706ec00

Please sign in to comment.