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

Merge commit '28816050e47b6dba430a52e429d21a864cffda8e' 

* commit '28816050e47b6dba430a52e429d21a864cffda8e':
  lavf: Set the stream time base hint properly for chained muxers

Conflicts:
	libavformat/segment.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-07 02:51:08 +02:00
parent 4db0e8fd33 28816050e4
commit 3726d07a2a
5 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/hdsenc.c
View File

@ -405,6 +405,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++;

1
libavformat/hlsenc.c
View File

@ -101,6 +101,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;
}
hls->start_pos = 0;

1
libavformat/mpegtsenc.c
View File

@ -721,6 +721,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;

1
libavformat/segment.c
View File

@ -162,6 +162,7 @@ static int segment_mux_init(AVFormatContext *s)
ocodec->codec_tag = 0;
}
st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
st->time_base = s->streams[i]->time_base;
av_dict_copy(&st->metadata, s->streams[i]->metadata, 0);
}

1
libavformat/smoothstreamingenc.c
View File

@ -343,6 +343,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) {