diff options
| author | Nicolas George <george@nsup.org> | 2017-12-30 12:17:08 +0100 |
|---|---|---|
| committer | Nicolas George <george@nsup.org> | 2017-12-31 10:33:24 +0100 |
| commit | e45f7bca735ff7ba965ec1e441199dc7aeb0c8fc (patch) | |
| tree | e7d605a22a02ae982b79c8a1893267dcf1de2e50 | |
| parent | 97b89432e4566a5d620f97bfdf4c8ae9c83d94e8 (diff) | |
| download | ffmpeg-e45f7bca735ff7ba965ec1e441199dc7aeb0c8fc.tar.gz | |
lavf/concatdec: properly init streams timestamp parameters.
pts_wrap_bits defaults to 33 (like MPEG), that causes valid
timestamps to be unwrapped and become invalid.
Inspired by a patch by Wu Zhiqiang <mymoeyard@gmail.com>.
| -rw-r--r-- | libavformat/concatdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 0e189012ad..bd5174ada2 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -185,8 +185,8 @@ static int copy_stream_props(AVStream *st, AVStream *source_st) return ret; st->r_frame_rate = source_st->r_frame_rate; st->avg_frame_rate = source_st->avg_frame_rate; - st->time_base = source_st->time_base; st->sample_aspect_ratio = source_st->sample_aspect_ratio; + avpriv_set_pts_info(st, 64, source_st->time_base.num, source_st->time_base.den); av_dict_copy(&st->metadata, source_st->metadata, 0); return 0; |