highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg_filter: drop unused InputFilterPriv.ist

Browse Source 
Outside of ifilter_bind_ist(), there are no longer any assumptions about
about filter inputs being fed by an InputStream.
This commit is contained in:
Anton Khirnov
2024-02-13 16:44:32 +01:00
parent daca5d1241
commit 6f2acd7a9c
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fftools/ffmpeg_filter.c
View File

@@ -109,8 +109,6 @@ typedef struct InputFilterPriv {
AVFilterContext *filter; AVFilterContext *filter;
InputStream *ist;
// used to hold submitted input // used to hold submitted input
AVFrame *frame; AVFrame *frame;
@@ -125,6 +123,7 @@ typedef struct InputFilterPriv {
enum AVMediaType type_src; enum AVMediaType type_src;
int eof; int eof;
int bound;
// parameters configured for this input // parameters configured for this input
int format; int format;
@@ -664,7 +663,8 @@ static int ifilter_bind_ist(InputFilter *ifilter, InputStream *ist)
FilterGraphPriv *fgp = fgp_from_fg(ifilter->graph); FilterGraphPriv *fgp = fgp_from_fg(ifilter->graph);
int ret, dec_idx; int ret, dec_idx;
av_assert0(!ifp->ist); av_assert0(!ifp->bound);
ifp->bound = 1;
if (ifp->type != ist->par->codec_type && if (ifp->type != ist->par->codec_type &&
!(ifp->type == AVMEDIA_TYPE_VIDEO && ist->par->codec_type == AVMEDIA_TYPE_SUBTITLE)) { !(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); return AVERROR(EINVAL);
} }
ifp->ist = ist;
ifp->type_src = ist->st->codecpar->codec_type; ifp->type_src = ist->st->codecpar->codec_type;
dec_idx = ist_filter_add(ist, ifilter, filtergraph_is_simple(ifilter->graph), dec_idx = ist_filter_add(ist, ifilter, filtergraph_is_simple(ifilter->graph),