diff options
| -rw-r--r-- | libavformat/nut.c | 2 | ||||
| -rw-r--r-- | libavformat/nutdec.c | 2 | ||||
| -rw-r--r-- | tests/libav.regression.ref | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index 546bde1cd0..fdcaac6a3e 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -26,7 +26,7 @@ void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){ int i; for(i=0; i<nut->avf->nb_streams; i++){ nut->stream[i].last_pts= av_rescale_rnd( - val / nut->time_base_count, + val, time_base.num * (int64_t)nut->stream[i].time_base->den, time_base.den * (int64_t)nut->stream[i].time_base->num, AV_ROUND_DOWN); diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index b457b47646..10f0198092 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -427,7 +427,7 @@ static int decode_syncpoint(NUTContext *nut, int64_t *ts, int64_t *back_ptr){ if(*back_ptr < 0) return -1; - ff_nut_reset_ts(nut, nut->time_base[tmp % nut->time_base_count], tmp); + ff_nut_reset_ts(nut, nut->time_base[tmp % nut->time_base_count], tmp / nut->time_base_count); if(skip_reserved(bc, end) || get_checksum(bc)){ av_log(s, AV_LOG_ERROR, "sync point checksum mismatch\n"); diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref index e28bc066e4..fa9bf772b5 100644 --- a/tests/libav.regression.ref +++ b/tests/libav.regression.ref @@ -30,8 +30,8 @@ f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv 2ba41cf880aa5cb87e8a08fdb735398d *./tests/data/b-libav.gxf 814640 ./tests/data/b-libav.gxf ./tests/data/b-libav.gxf CRC=0xa376c09e -b54fe5ee2983506550b4433b63845daf *./tests/data/b-libav.nut -331018 ./tests/data/b-libav.nut +79d92ebd1e760575136fb5f0782d5151 *./tests/data/b-libav.nut +331022 ./tests/data/b-libav.nut ./tests/data/b-libav.nut CRC=0x400c29e9 43238b15f1012aa27536c2be20bb2383 *./tests/data/b-libav.mkv 329854 ./tests/data/b-libav.mkv |