|
@@ -871,10 +871,11 @@ static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u
|
|
|
static void close_output_stream(OutputStream *ost)
|
|
|
{
|
|
|
OutputFile *of = output_files[ost->file_index];
|
|
|
+ AVRational time_base = ost->stream_copy ? ost->mux_timebase : ost->enc_ctx->time_base;
|
|
|
|
|
|
ost->finished |= ENCODER_FINISHED;
|
|
|
if (of->shortest) {
|
|
|
- int64_t end = av_rescale_q(ost->sync_opts - ost->first_pts, ost->enc_ctx->time_base, AV_TIME_BASE_Q);
|
|
|
+ int64_t end = av_rescale_q(ost->sync_opts - ost->first_pts, time_base, AV_TIME_BASE_Q);
|
|
|
of->recording_time = FFMIN(of->recording_time, end);
|
|
|
}
|
|
|
}
|
|
@@ -1483,13 +1484,13 @@ static void do_video_stats(OutputStream *ost, int frame_size)
|
|
|
static void finish_output_stream(OutputStream *ost)
|
|
|
{
|
|
|
OutputFile *of = output_files[ost->file_index];
|
|
|
- int i;
|
|
|
+ AVRational time_base = ost->stream_copy ? ost->mux_timebase : ost->enc_ctx->time_base;
|
|
|
|
|
|
ost->finished = ENCODER_FINISHED | MUXER_FINISHED;
|
|
|
|
|
|
if (of->shortest) {
|
|
|
- for (i = 0; i < of->ctx->nb_streams; i++)
|
|
|
- output_streams[of->ost_index + i]->finished = ENCODER_FINISHED | MUXER_FINISHED;
|
|
|
+ int64_t end = av_rescale_q(ost->sync_opts - ost->first_pts, time_base, AV_TIME_BASE_Q);
|
|
|
+ of->recording_time = FFMIN(of->recording_time, end);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -2086,10 +2087,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /* force the input stream PTS */
|
|
|
- if (ost->enc_ctx->codec_type == AVMEDIA_TYPE_VIDEO)
|
|
|
- ost->sync_opts++;
|
|
|
-
|
|
|
if (av_packet_ref(opkt, pkt) < 0)
|
|
|
exit_program(1);
|
|
|
|
|
@@ -2113,6 +2110,8 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
|
|
|
|
|
|
opkt->duration = av_rescale_q(pkt->duration, ist->st->time_base, ost->mux_timebase);
|
|
|
|
|
|
+ ost->sync_opts += opkt->duration;
|
|
|
+
|
|
|
output_packet(of, opkt, ost, 0);
|
|
|
}
|
|
|
|