diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-07 02:51:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-07 02:51:08 +0200 |
| commit | 3726d07a2af8d57f5af57be339c94fe902853e10 (patch) | |
| tree | fe9feefe5d0c1c0d9dd5a56ae42cbd96886d567c /libavformat/segment.c | |
| parent | 4db0e8fd3366eadb2d6374b647b8738208749348 (diff) | |
| parent | 28816050e47b6dba430a52e429d21a864cffda8e (diff) | |
| download | ffmpeg-3726d07a2af8d57f5af57be339c94fe902853e10.tar.gz | |
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>
Diffstat (limited to 'libavformat/segment.c')
| -rw-r--r-- | libavformat/segment.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index f35bbef8dc..6183208fa2 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -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); } |