RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-07 15:50:43 +00:00
Code Issues Projects Releases Wiki Activity

avformat/segment: export inner muxer timebase

Browse Source 
Fixes "Non-monotonous DTS in output stream 0:0"
Fixes Ticket4020

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ce80f9fee9)
This commit is contained in:
Michael Niedermayer 2014-11-16 02:49:12 +01:00 committed by Carl Eugen Hoyos
parent 3e0802e42b
commit cc9c74ea87
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/segment.c
View File

@ -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;