virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avfilter/af_join: do not use ff_outlink_get_status() on inlink

Browse Source
This commit is contained in:
Paul B Mahol 2023-05-30 00:43:08 +02:00
parent 51a1124a68
commit ac6a6d1abf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/af_join.c
View File

@ -52,6 +52,7 @@ typedef struct JoinContext {
AVChannelLayout ch_layout; AVChannelLayout ch_layout;
int64_t eof_pts; int64_t eof_pts;
int eof;
ChannelMap *channels; ChannelMap *channels;
@ -556,10 +557,11 @@ fail:
return ret; return ret;
eof: eof:
for (i = 0; i < ctx->nb_inputs; i++) { for (i = 0; i < ctx->nb_inputs; i++) {
if (ff_outlink_get_status(ctx->inputs[i]) && if (s->eof &&
ff_inlink_queued_samples(ctx->inputs[i]) <= 0 && ff_inlink_queued_samples(ctx->inputs[i]) <= 0 &&
!s->input_frames[i]) { !s->input_frames[i]) {
ff_outlink_set_status(outlink, AVERROR_EOF, s->eof_pts); ff_outlink_set_status(outlink, AVERROR_EOF, s->eof_pts);
break;
} }
} }
@ -580,11 +582,10 @@ static int activate(AVFilterContext *ctx)
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} else if (ret == 0 && ff_inlink_acknowledge_status(ctx->inputs[0], &status, &pts)) { } else if (ret == 0 && ff_inlink_acknowledge_status(ctx->inputs[0], &status, &pts)) {
ff_outlink_set_status(ctx->outputs[0], status, s->eof_pts); s->eof |= status == AVERROR_EOF;
return 0;
} }
if (!s->input_frames[0] && ff_outlink_frame_wanted(ctx->outputs[0])) { if (!s->eof && !s->input_frames[0] && ff_outlink_frame_wanted(ctx->outputs[0])) {
ff_inlink_request_frame(ctx->inputs[0]); ff_inlink_request_frame(ctx->inputs[0]);
return 0; return 0;
} }
@ -600,11 +601,10 @@ static int activate(AVFilterContext *ctx)
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} else if (ff_inlink_acknowledge_status(ctx->inputs[i], &status, &pts)) { } else if (ff_inlink_acknowledge_status(ctx->inputs[i], &status, &pts)) {
ff_outlink_set_status(ctx->outputs[0], status, pts); s->eof |= status == AVERROR_EOF;
return 0;
} }
if (!s->input_frames[i]) { if (!s->eof && !s->input_frames[i]) {
ff_inlink_request_frame(ctx->inputs[i]); ff_inlink_request_frame(ctx->inputs[i]);
return 0; return 0;
} }