Commit 28816050 authored by Martin Storsjö's avatar Martin Storsjö

lavf: Set the stream time base hint properly for chained muxers

This avoids warnings about using the codec time base as time
base hint.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent b7624944
...@@ -398,6 +398,7 @@ static int hds_write_header(AVFormatContext *s) ...@@ -398,6 +398,7 @@ static int hds_write_header(AVFormatContext *s)
} }
avcodec_copy_context(st->codec, s->streams[i]->codec); avcodec_copy_context(st->codec, s->streams[i]->codec);
st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio; 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) if (c->streams[c->nb_streams].ctx)
c->nb_streams++; c->nb_streams++;
......
...@@ -80,6 +80,7 @@ static int hls_mux_init(AVFormatContext *s) ...@@ -80,6 +80,7 @@ static int hls_mux_init(AVFormatContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
avcodec_copy_context(st->codec, s->streams[i]->codec); avcodec_copy_context(st->codec, s->streams[i]->codec);
st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio; st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
st->time_base = s->streams[i]->time_base;
} }
return 0; return 0;
......
...@@ -604,6 +604,7 @@ static int mpegts_write_header(AVFormatContext *s) ...@@ -604,6 +604,7 @@ static int mpegts_write_header(AVFormatContext *s)
ret = avcodec_copy_context(ast->codec, st->codec); ret = avcodec_copy_context(ast->codec, st->codec);
if (ret != 0) if (ret != 0)
goto fail; goto fail;
ast->time_base = st->time_base;
ret = avformat_write_header(ts_st->amux, NULL); ret = avformat_write_header(ts_st->amux, NULL);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
......
...@@ -74,6 +74,7 @@ static int segment_mux_init(AVFormatContext *s) ...@@ -74,6 +74,7 @@ static int segment_mux_init(AVFormatContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
avcodec_copy_context(st->codec, s->streams[i]->codec); avcodec_copy_context(st->codec, s->streams[i]->codec);
st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio; st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
st->time_base = s->streams[i]->time_base;
} }
return 0; return 0;
......
...@@ -342,6 +342,7 @@ static int ism_write_header(AVFormatContext *s) ...@@ -342,6 +342,7 @@ static int ism_write_header(AVFormatContext *s)
} }
avcodec_copy_context(st->codec, s->streams[i]->codec); avcodec_copy_context(st->codec, s->streams[i]->codec);
st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio; 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); ctx->pb = avio_alloc_context(os->iobuf, sizeof(os->iobuf), AVIO_FLAG_WRITE, os, NULL, ism_write, ism_seek);
if (!ctx->pb) { if (!ctx->pb) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment