lavf: Set the stream time base hint properly for chained muxers
authorMartin Storsjö <martin@martin.st>
Mon, 6 Oct 2014 08:41:33 +0000 (11:41 +0300)
committerMartin Storsjö <martin@martin.st>
Mon, 6 Oct 2014 20:30:52 +0000 (23:30 +0300)
This avoids warnings about using the codec time base as time
base hint.

Signed-off-by: Martin Storsjö <martin@martin.st>
libavformat/hdsenc.c
libavformat/hlsenc.c
libavformat/mpegtsenc.c
libavformat/segment.c
libavformat/smoothstreamingenc.c

index 882f157..53fef33 100644 (file)
@@ -398,6 +398,7 @@ static int hds_write_header(AVFormatContext *s)
         }
         avcodec_copy_context(st->codec, s->streams[i]->codec);
         st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
+        st->time_base = s->streams[i]->time_base;
     }
     if (c->streams[c->nb_streams].ctx)
         c->nb_streams++;
index 5d18d13..ad53df5 100644 (file)
@@ -80,6 +80,7 @@ static int hls_mux_init(AVFormatContext *s)
             return AVERROR(ENOMEM);
         avcodec_copy_context(st->codec, s->streams[i]->codec);
         st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
+        st->time_base = s->streams[i]->time_base;
     }
 
     return 0;
index 7621103..1082650 100644 (file)
@@ -604,6 +604,7 @@ static int mpegts_write_header(AVFormatContext *s)
             ret = avcodec_copy_context(ast->codec, st->codec);
             if (ret != 0)
                 goto fail;
+            ast->time_base = st->time_base;
             ret = avformat_write_header(ts_st->amux, NULL);
             if (ret < 0)
                 goto fail;
index 9c757e4..52da6b9 100644 (file)
@@ -74,6 +74,7 @@ static int segment_mux_init(AVFormatContext *s)
             return AVERROR(ENOMEM);
         avcodec_copy_context(st->codec, s->streams[i]->codec);
         st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
+        st->time_base = s->streams[i]->time_base;
     }
 
     return 0;
index d955b34..b9f1dcb 100644 (file)
@@ -342,6 +342,7 @@ static int ism_write_header(AVFormatContext *s)
         }
         avcodec_copy_context(st->codec, s->streams[i]->codec);
         st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
+        st->time_base = s->streams[i]->time_base;
 
         ctx->pb = avio_alloc_context(os->iobuf, sizeof(os->iobuf), AVIO_FLAG_WRITE, os, NULL, ism_write, ism_seek);
         if (!ctx->pb) {