RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2014-05-19 15:13:16 +02:00
parent 3791741cf9 dc40d88625
commit 2de2b991ca
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg.c
View File

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