diff mbox series

[FFmpeg-devel,03/18] fftools/ffmpeg_filter: drop unused InputFilterPriv.ist

Message ID 20240306110319.17339-3-anton@khirnov.net
State Accepted
Commit 6f2acd7a9c5ac6d814882d2cd2208556df6bb4c0
Headers show
Series [FFmpeg-devel,01/18] fftools/cmdutils: fix printing group name in split_commandline() | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov March 6, 2024, 11:03 a.m. UTC 
Outside of ifilter_bind_ist(), there are no longer any assumptions about
about filter inputs being fed by an InputStream.
---
 fftools/ffmpeg_filter.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 9d9762a599..37705297fb 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),