Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'

[ffmpeg] / libavformat / sapenc.c

diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c
index 738e8b8f911aa1a86d06c87e4639c939681ace9c..82a6ef67fd5d905881767e881e71985c60df3c92 100644 (file)
--- a/libavformat/sapenc.c
+++ b/libavformat/sapenc.c
@@ -158,6 +158,7 @@ static int sap_write_header(AVFormatContext *s)
         if (ret < 0)
             goto fail;
         s->streams[i]->priv_data = contexts[i];
+        s->streams[i]->time_base = contexts[i]->streams[0]->time_base;
         av_strlcpy(contexts[i]->filename, url, sizeof(contexts[i]->filename));
     }
 
@@ -245,7 +246,7 @@ static int sap_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     AVFormatContext *rtpctx;
     struct SAPState *sap = s->priv_data;
-    int64_t now = av_gettime();
+    int64_t now = av_gettime_relative();
 
     if (!sap->last_time || now - sap->last_time > 5000000) {
         int ret = ffurl_write(sap->ann_fd, sap->ann, sap->ann_size);