From 3f11582ca3d40fd98d00ad52b84348add4aa3b31 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 13 Apr 2023 14:32:57 +0200 Subject: fftools/ffmpeg_mux: stop using filter_in_rescale_delta_last for streamcopy That field was added to store timestamp conversion state for audio decoding code. Later it started being used by streamcopy as well, but that use is wrong because, for a given input stream, both decoding and an arbitrary number of streamcopies may be performed simultaneously. They would then all overwrite the same state variable. Store this state in MuxStream instead. This is the last use of InputStream in of_streamcopy(), so the ist parameter can now be removed. --- fftools/ffmpeg.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'fftools/ffmpeg.h') diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 46b4614ec4..6ad3245166 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -876,8 +876,7 @@ void of_output_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int eof) /** * @param dts predicted packet dts in AV_TIME_BASE_Q */ -void of_streamcopy(InputStream *ist, OutputStream *ost, - const AVPacket *pkt, int64_t dts); +void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts); int64_t of_filesize(OutputFile *of); -- cgit v1.2.1