diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 17:13:16 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-19 17:13:16 +0400 |
commit | 2de2b991cac603cc6ad1ff94c706c64a2232f69b (patch) | |
tree | 075cf4d142f0d7682b2d4b3f9b4a93da15568e37 | |
parent | 3791741cf97f6803f7ec1beb8da025f1f779e845 (diff) | |
parent | dc40d88625d7e402d58ac3f3df69fbf27aa31ea0 (diff) |
Merge commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0'
* commit 'dc40d88625d7e402d58ac3f3df69fbf27aa31ea0':
avconv: do not use poorly defined and undocumented AVStream.pts
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | ffmpeg.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1102,7 +1102,7 @@ static void do_video_stats(OutputStream *ost, int frame_size) fprintf(vstats_file,"f_size= %6d ", frame_size); /* compute pts value */ - ti1 = ost->st->pts.val * av_q2d(enc->time_base); + ti1 = ost->last_mux_dts * av_q2d(enc->time_base); if (ti1 < 0.01) ti1 = 0.01; @@ -1414,8 +1414,8 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti vid = 1; } /* compute min output value */ - if (ost->st->pts.val != AV_NOPTS_VALUE) - pts = FFMAX(pts, av_rescale_q(ost->st->pts.val, + if (ost->last_mux_dts != AV_NOPTS_VALUE) + pts = FFMAX(pts, av_rescale_q(ost->last_mux_dts, ost->st->time_base, AV_TIME_BASE_Q)); } |