Showing the changes to libavfilter (4 of 4 files). Show all
Unified · Split
| @@ -110,7 +110,7 @@ static int activate(AVFilterContext *ctx) · 109 unmodified lines | |||
| 110 | 110 | ||
| 111 | if (ff_outlink_frame_wanted(ctx->outputs[0])) { | 111 | if (ff_outlink_frame_wanted(ctx->outputs[0])) { |
| 112 | for (i = 0; i < 2; i++) { | 112 | for (i = 0; i < 2; i++) { |
| 113 | if (ff_inlink_queued_samples(ctx->inputs[i]) > 0) | 113 | if (s->frames[i] || ff_inlink_queued_samples(ctx->inputs[i]) > 0) |
| 114 | continue; | 114 | continue; |
| 115 | ff_inlink_request_frame(ctx->inputs[i]); | 115 | ff_inlink_request_frame(ctx->inputs[i]); |
| 116 | return 0; | 116 | return 0; |
| @@ -162,7 +162,7 @@ static int activate(AVFilterContext *ctx) · 161 unmodified lines | |||
| 162 | 162 | ||
| 163 | if (ff_outlink_frame_wanted(ctx->outputs[0])) { | 163 | if (ff_outlink_frame_wanted(ctx->outputs[0])) { |
| 164 | for (i = 0; i < 2; i++) { | 164 | for (i = 0; i < 2; i++) { |
| 165 | if (ff_inlink_queued_samples(ctx->inputs[i]) > 0) | 165 | if (s->frame[i] || ff_inlink_queued_samples(ctx->inputs[i]) > 0) |
| 166 | continue; | 166 | continue; |
| 167 | ff_inlink_request_frame(ctx->inputs[i]); | 167 | ff_inlink_request_frame(ctx->inputs[i]); |
| 168 | return 0; | 168 | return 0; |
| @@ -159,7 +159,7 @@ static int activate(AVFilterContext *ctx) · 158 unmodified lines | |||
| 159 | 159 | ||
| 160 | if (ff_outlink_frame_wanted(ctx->outputs[0])) { | 160 | if (ff_outlink_frame_wanted(ctx->outputs[0])) { |
| 161 | for (i = 0; i < 2; i++) { | 161 | for (i = 0; i < 2; i++) { |
| 162 | if (ff_inlink_queued_samples(ctx->inputs[i]) > 0) | 162 | if (s->frame[i] || ff_inlink_queued_samples(ctx->inputs[i]) > 0) |
| 163 | continue; | 163 | continue; |
| 164 | ff_inlink_request_frame(ctx->inputs[i]); | 164 | ff_inlink_request_frame(ctx->inputs[i]); |
| 165 | return 0; | 165 | return 0; |
| @@ -186,11 +186,11 @@ static int activate(AVFilterContext *ctx) · 185 unmodified lines | |||
| 186 | 186 | ||
| 187 | if (ff_outlink_frame_wanted(outlink)) { | 187 | if (ff_outlink_frame_wanted(outlink)) { |
| 188 | for (int i = 0; i < 2; i++) { | 188 | for (int i = 0; i < 2; i++) { |
| 189 | if (ff_inlink_queued_samples(ctx->inputs[i]) > 0) | 189 | if (s->cache[i] || ff_inlink_queued_samples(ctx->inputs[i]) > 0) |
| 190 | continue; | 190 | continue; |
| 191 | ff_inlink_request_frame(ctx->inputs[i]); | 191 | ff_inlink_request_frame(ctx->inputs[i]); |
| 192 | return 0; | ||
| 192 | } | 193 | } |
| 193 | return 0; | ||
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | return FFERROR_NOT_READY; | 196 | return FFERROR_NOT_READY; |