[FFmpeg-cvslog] fftools/ffmpeg_filter: drop unused InputFilterPriv.ist
Anton Khirnov
git at videolan.org
Wed Mar 13 09:26:55 EET 2024
ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Feb 13 16:44:32 2024 +0100| [6f2acd7a9c5ac6d814882d2cd2208556df6bb4c0] | committer: Anton Khirnov
fftools/ffmpeg_filter: drop unused InputFilterPriv.ist
Outside of ifilter_bind_ist(), there are no longer any assumptions about
about filter inputs being fed by an InputStream.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f2acd7a9c5ac6d814882d2cd2208556df6bb4c0
---
fftools/ffmpeg_filter.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index da6687028a..28d287a627 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -109,8 +109,6 @@ typedef struct InputFilterPriv {
AVFilterContext *filter;
- InputStream *ist;
-
// used to hold submitted input
AVFrame *frame;
@@ -125,6 +123,7 @@ typedef struct InputFilterPriv {
enum AVMediaType type_src;
int eof;
+ int bound;
// parameters configured for this input
int format;
@@ -664,7 +663,8 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist)
FilterGraphPriv *fgp = fgp_from_fg(ifilter->graph);
int ret, dec_idx;
- av_assert0(!ifp->ist);
+ av_assert0(!ifp->bound);
+ ifp->bound = 1;
if (ifp->type != ist->par->codec_type &&
!(ifp->type == AVMEDIA_TYPE_VIDEO && ist->par->codec_type == AVMEDIA_TYPE_SUBTITLE)) {
@@ -673,7 +673,6 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist)
return AVERROR(EINVAL);
}
- ifp->ist = ist;
ifp->type_src = ist->st->codecpar->codec_type;
dec_idx = ist_filter_add(ist, ifilter, filtergraph_is_simple(ifilter->graph),
More information about the ffmpeg-cvslog
mailing list