From e8df737cb2305efb137e655e7f6dfd5e4c80bc5c Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 30 Apr 2023 12:24:50 +0200 Subject: [PATCH] fftools/ffmpeg_filter: move InputFilter.eof to private data It is not used outside of ffmpeg_filter. --- fftools/ffmpeg.h | 2 -- fftools/ffmpeg_filter.c | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 602005f071..aa7778a58f 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -289,8 +289,6 @@ typedef struct InputFilter { AVBufferRef *hw_frames_ctx; int32_t *displaymatrix; - - int eof; } InputFilter; typedef struct OutputFilter { diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 3fad38f782..5d9242f476 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -55,6 +55,8 @@ static FilterGraphPriv *fgp_from_fg(FilterGraph *fg) typedef struct InputFilterPriv { InputFilter ifilter; + int eof; + AVRational time_base; AVFifo *frame_queue; @@ -1353,7 +1355,8 @@ int configure_filtergraph(FilterGraph *fg) /* send the EOFs for the finished inputs */ for (i = 0; i < fg->nb_inputs; i++) { - if (fg->inputs[i]->eof) { + InputFilterPriv *ifp = ifp_from_ifilter(fg->inputs[i]); + if (ifp->eof) { ret = av_buffersrc_add_frame(fg->inputs[i]->filter, NULL); if (ret < 0) goto fail; @@ -1500,7 +1503,7 @@ int ifilter_send_eof(InputFilter *ifilter, int64_t pts, AVRational tb) InputFilterPriv *ifp = ifp_from_ifilter(ifilter); int ret; - ifilter->eof = 1; + ifp->eof = 1; if (ifilter->filter) { pts = av_rescale_q_rnd(pts, tb, ifp->time_base,