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

fftools/ffmpeg_mux: flush bsfs immediately on exceeding recoding time 

Current code marks the output stream as finished and waits for a flush
packet, but that is both unnecessary and suspect, as in theory nothing
should be sent to a finished stream - not even flush packets.
This commit is contained in:
Anton Khirnov 2023-05-25 08:50:19 +02:00
parent 2674532eee
commit 106167374c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fftools/ffmpeg_mux.c
View File

@ -386,6 +386,11 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
AVPacket *opkt = ost->pkt; AVPacket *opkt = ost->pkt;
av_packet_unref(opkt); av_packet_unref(opkt);
if (of->recording_time != INT64_MAX &&
dts >= of->recording_time + start_time)
pkt = NULL;
// EOF: flush output bitstream filters. // EOF: flush output bitstream filters.
if (!pkt) { if (!pkt) {
of_output_packet(of, opkt, ost, 1); of_output_packet(of, opkt, ost, 1);
@ -407,12 +412,6 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
return; return;
} }
if (of->recording_time != INT64_MAX &&
dts >= of->recording_time + start_time) {
close_output_stream(ost);
return;
}
if (av_packet_ref(opkt, pkt) < 0) if (av_packet_ref(opkt, pkt) < 0)
exit_program(1); exit_program(1);