RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_filter: drop OutputFilter.ost 

All remaining code accessing it only needs to know whether this
filtergraph output has been bound or not.
This commit is contained in:
Anton Khirnov 2024-04-04 11:35:26 +02:00
parent f2c919252d
commit d74cbcb963
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

@ -314,12 +314,12 @@ typedef struct InputFilter {
typedef struct OutputFilter {
const AVClass *class;
struct OutputStream *ost;
struct FilterGraph *graph;
uint8_t *name;
/* for filters that are not yet bound to an output stream,
* this stores the output linklabel, if any */
int bound;
uint8_t *linklabel;
char *apad;

6
fftools/ffmpeg_filter.c
View File

@ -806,10 +806,10 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost,
FilterGraphPriv *fgp = fgp_from_fg(fg);
int ret;
av_assert0(!ofilter->ost);
av_assert0(!ofilter->bound);
av_assert0(ofilter->type == ost->type);
ofilter->ost = ost;
ofilter->bound = 1;
av_freep(&ofilter->linklabel);
ofp->flags = opts->flags;
@ -1279,7 +1279,7 @@ int fg_finalise_bindings(FilterGraph *fg)
for (int i = 0; i < fg->nb_outputs; i++) {
OutputFilter *output = fg->outputs[i];
if (!output->ost) {
if (!output->bound) {
av_log(filtergraphs[i], AV_LOG_FATAL,
"Filter %s has an unconnected output\n", output->name);
return AVERROR(EINVAL);

2
fftools/ffmpeg_mux_init.c
View File

@ -1827,7 +1827,7 @@ static int create_streams(Muxer *mux, const OptionsContext *o)
for (int j = 0; j < fg->nb_outputs; j++) {
OutputFilter *ofilter = fg->outputs[j];
if (ofilter->linklabel || ofilter->ost)
if (ofilter->linklabel || ofilter->bound)
continue;
auto_disable |= 1 << ofilter->type;