diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-16 02:49:12 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-11-17 01:08:48 +0100 |
| commit | cc9c74ea877392a8ee44724a9c588802225503c3 (patch) | |
| tree | f90e933d9d3ea9b1f7cca7c796453485607b5e1a | |
| parent | 3e0802e42b07e4c9262240aa2caf208eebac70a2 (diff) | |
| download | ffmpeg-cc9c74ea877392a8ee44724a9c588802225503c3.tar.gz | |
avformat/segment: export inner muxer timebase
Fixes "Non-monotonous DTS in output stream 0:0"
Fixes Ticket4020
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ce80f9fee97160049687bbbef4eb31a68166c3ee)
| -rw-r--r-- | libavformat/segment.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/segment.c b/libavformat/segment.c index f35bbef8dc..eb1cfee4f3 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -567,6 +567,7 @@ static int seg_write_header(AVFormatContext *s) AVFormatContext *oc = NULL; AVDictionary *options = NULL; int ret; + int i; seg->segment_count = 0; if (!seg->write_header_trailer) @@ -672,6 +673,13 @@ static int seg_write_header(AVFormatContext *s) } seg->segment_frame_count = 0; + av_assert0(s->nb_streams == oc->nb_streams); + for (i = 0; i < s->nb_streams; i++) { + AVStream *inner_st = oc->streams[i]; + AVStream *outer_st = s->streams[i]; + avpriv_set_pts_info(outer_st, inner_st->pts_wrap_bits, inner_st->time_base.num, inner_st->time_base.den); + } + if (oc->avoid_negative_ts > 0 && s->avoid_negative_ts < 0) s->avoid_negative_ts = 1; |