Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / seek-test.c

diff --git a/libavformat/seek-test.c b/libavformat/seek-test.c
index ec88a0baf2247f76ee1ac97449b4c53574f64aa9..9d7575d39e9b5123940b0043ccd93a83ebb2a573 100644 (file)
--- a/libavformat/seek-test.c
+++ b/libavformat/seek-test.c
@@ -48,13 +48,12 @@ static const char *ret_str(int v)
 
 static void ts_str(char buffer[60], int64_t ts, AVRational base)
 {
-    double tsval;
     if (ts == AV_NOPTS_VALUE) {
         strcpy(buffer, " NOPTS   ");
         return;
     }
-    tsval = ts * av_q2d(base);
-    snprintf(buffer, 60, "%9f", tsval);
+    ts= av_rescale_q(ts, base, (AVRational){1, 1000000});
+    snprintf(buffer, 60, "%c%"PRId64".%06"PRId64"", ts<0 ? '-' : ' ', FFABS(ts)/1000000, FFABS(ts)%1000000);
 }
 
 int main(int argc, char **argv)
@@ -127,7 +126,7 @@ int main(int argc, char **argv)
         printf("ret:%-10s st:%2d flags:%d  ts:%s\n", ret_str(ret), stream_id, i&1, ts_buf);
     }
 
-    av_close_input_file(ic);
+    avformat_close_input(&ic);
 
     return 0;
 }