Having two different functions allows to have stricter tests and detect errors earlier.
Unified · Split
| @@ -408,6 +408,7 @@ int ff_request_frame(AVFilterLink *link) · 407 unmodified lines | |||
| 408 | { | 408 | { |
| 409 | FF_TPRINTF_START(NULL, request_frame); ff_tlog_link(NULL, link, 1); | 409 | FF_TPRINTF_START(NULL, request_frame); ff_tlog_link(NULL, link, 1); |
| 410 | 410 | ||
| 411 | av_assert1(!link->dst->filter->activate); | ||
| 411 | if (link->status_out) | 412 | if (link->status_out) |
| 412 | return link->status_out; | 413 | return link->status_out; |
| 413 | if (link->status_in) { | 414 | if (link->status_in) { |
| @@ -309,6 +309,9 @@ int ff_poll_frame(AVFilterLink *link); · 308 unmodified lines | |||
| 309 | /** | 309 | /** |
| 310 | * Request an input frame from the filter at the other end of the link. | 310 | * Request an input frame from the filter at the other end of the link. |
| 311 | * | 311 | * |
| 312 | * This function must not be used by filters using the activate callback, | ||
| 313 | * use ff_link_set_frame_wanted() instead. | ||
| 314 | * | ||
| 312 | * The input filter may pass the request on to its inputs, fulfill the | 315 | * The input filter may pass the request on to its inputs, fulfill the |
| 313 | * request from an internal buffer or any other means specific to its function. | 316 | * request from an internal buffer or any other means specific to its function. |
| 314 | * | 317 | * |