mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'
* commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34': lavf: Don't interpret just slightly broken timestamps as wraparound Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
f7bc03bcaf
|
@ -1017,7 +1017,9 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
|
||||||
pc && pc->pict_type != AV_PICTURE_TYPE_B)
|
pc && pc->pict_type != AV_PICTURE_TYPE_B)
|
||||||
presentation_delayed = 1;
|
presentation_delayed = 1;
|
||||||
|
|
||||||
if(pkt->pts != AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && st->pts_wrap_bits<63 && pkt->dts - (1LL<<(st->pts_wrap_bits-1)) > pkt->pts){
|
if (pkt->pts != AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE &&
|
||||||
|
st->pts_wrap_bits < 63 &&
|
||||||
|
pkt->dts - (1LL << (st->pts_wrap_bits - 1)) > pkt->pts) {
|
||||||
if(is_relative(st->cur_dts) || pkt->dts - (1LL<<(st->pts_wrap_bits-1)) > st->cur_dts) {
|
if(is_relative(st->cur_dts) || pkt->dts - (1LL<<(st->pts_wrap_bits-1)) > st->cur_dts) {
|
||||||
pkt->dts -= 1LL<<st->pts_wrap_bits;
|
pkt->dts -= 1LL<<st->pts_wrap_bits;
|
||||||
} else
|
} else
|
||||||
|
|
Loading…
Reference in New Issue