summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2024-02-13 16:44:32 +0100
committerAnton Khirnov <anton@khirnov.net>2024-03-09 20:03:33 +0100
commit443b41a189c5632f2ed20fd64b63ac0a6a47ada2 (patch)
treeede163cbc919bc2cc146d02be3534ac0163695a8
parenteacd49841f2cb3bb1ff0f2af966e91fca280c751 (diff)
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.
-rw-r--r--fftools/ffmpeg_filter.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 66168898df..07969305c8 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),