RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

hls: Copy the time base from the chained demuxer 

When a variant stream isn't mpegts but e.g. raw adts, the
default time base (90k) isn't correct.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Michael Niedermayer 2013-03-07 13:42:12 +01:00 committed by Martin Storsjö
parent eb33ba04e0
commit 82bf8c8783
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/hls.c
View File

@ -530,11 +530,13 @@ static int hls_read_header(AVFormatContext *s)
/* Create new AVStreams for each stream in this variant */ /* Create new AVStreams for each stream in this variant */
for (j = 0; j < v->ctx->nb_streams; j++) { for (j = 0; j < v->ctx->nb_streams; j++) {
AVStream *st = avformat_new_stream(s, NULL); AVStream *st = avformat_new_stream(s, NULL);
AVStream *ist = v->ctx->streams[j];
if (!st) { if (!st) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
st->id = i; st->id = i;
avpriv_set_pts_info(st, ist->pts_wrap_bits, ist->time_base.num, ist->time_base.den);
avcodec_copy_context(st->codec, v->ctx->streams[j]->codec); avcodec_copy_context(st->codec, v->ctx->streams[j]->codec);
if (v->bandwidth) if (v->bandwidth)
av_dict_set(&st->metadata, "variant_bitrate", bitrate_str, av_dict_set(&st->metadata, "variant_bitrate", bitrate_str,