[FFmpeg-cvslog] r11851 - in trunk: libavformat/nut.c libavformat/nutdec.c tests/libav.regression.ref

[ods15]

Author: ods15
Date: Mon Feb  4 11:27:32 2008
New Revision: 11851

Log:
ff_nut_reset_ts() expected to get 'ts*time_base_count', but muxer only 
gave it 'ts'. Fixed by changing ff_nut_reset_ts() and demuxer params


Modified:
   trunk/libavformat/nut.c
   trunk/libavformat/nutdec.c
   trunk/tests/libav.regression.ref

Modified: trunk/libavformat/nut.c
==============================================================================
--- trunk/libavformat/nut.c	(original)
+++ trunk/libavformat/nut.c	Mon Feb  4 11:27:32 2008
@@ -26,7 +26,7 @@ void ff_nut_reset_ts(NUTContext *nut, AV
     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);

Modified: trunk/libavformat/nutdec.c
==============================================================================
--- trunk/libavformat/nutdec.c	(original)
+++ trunk/libavformat/nutdec.c	Mon Feb  4 11:27:32 2008
@@ -427,7 +427,7 @@ static int decode_syncpoint(NUTContext *
     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");

Modified: trunk/tests/libav.regression.ref
==============================================================================
--- trunk/tests/libav.regression.ref	(original)
+++ trunk/tests/libav.regression.ref	Mon Feb  4 11:27:32 2008
@@ -30,8 +30,8 @@ f8ad5bd78f4d012a8ce9570aa395ac54 *./test
 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