summaryrefslogtreecommitdiff
path: root/fftools/ffmpeg_mux.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2022-11-17 12:42:01 +0100
committerAnton Khirnov <anton@khirnov.net>2022-11-28 10:28:14 +0100
commitb1143330c8db6e738312245414656a001cd007a4 (patch)
treeb1a7e0e957f39ff6adeb0db5d67e48af32f32fce /fftools/ffmpeg_mux.c
parent630fbdcc526c919986ff8ccc6712653ff1ef637b (diff)
downloadffmpeg-b1143330c8db6e738312245414656a001cd007a4.tar.gz
fftools/ffmpeg: move force-keyframe-related vars to a separate struct
There are 8 of them and they are typically used together. Allows to pass just this struct to forced_kf_apply(), which makes it clear that the rest of the OutputStream is not accessed there.
Diffstat (limited to 'fftools/ffmpeg_mux.c')
-rw-r--r--fftools/ffmpeg_mux.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index 2b885f7ab0..7da29db8f4 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -667,11 +667,12 @@ static void ost_free(OutputStream **post)
av_packet_free(&ost->pkt);
av_dict_free(&ost->encoder_opts);
- av_freep(&ost->forced_keyframes);
- av_expr_free(ost->forced_keyframes_pexpr);
+ av_freep(&ost->kf.forced_keyframes);
+ av_freep(&ost->kf.pts);
+ av_expr_free(ost->kf.pexpr);
+
av_freep(&ost->avfilter);
av_freep(&ost->logfile_prefix);
- av_freep(&ost->forced_kf_pts);
av_freep(&ost->apad);
#if FFMPEG_OPT_MAP_CHANNEL