Skip to content
Snippets Groups Projects
Commit ae4650f0 authored by Nicolas George's avatar Nicolas George
Browse files

lavfi: disallow ff_request_frame for filters using activate.

Having two different functions allows to have stricter tests
and detect errors earlier.
parent 9eb4c79a
No related branches found
No related tags found
No related merge requests found
...@@ -408,6 +408,7 @@ int ff_request_frame(AVFilterLink *link) ...@@ -408,6 +408,7 @@ int ff_request_frame(AVFilterLink *link)
{ {
FF_TPRINTF_START(NULL, request_frame); ff_tlog_link(NULL, link, 1); FF_TPRINTF_START(NULL, request_frame); ff_tlog_link(NULL, link, 1);
av_assert1(!link->dst->filter->activate);
if (link->status_out) if (link->status_out)
return link->status_out; return link->status_out;
if (link->status_in) { if (link->status_in) {
......
...@@ -309,6 +309,9 @@ int ff_poll_frame(AVFilterLink *link); ...@@ -309,6 +309,9 @@ int ff_poll_frame(AVFilterLink *link);
/** /**
* Request an input frame from the filter at the other end of the link. * Request an input frame from the filter at the other end of the link.
* *
* This function must not be used by filters using the activate callback,
* use ff_link_set_frame_wanted() instead.
*
* The input filter may pass the request on to its inputs, fulfill the * The input filter may pass the request on to its inputs, fulfill the
* request from an internal buffer or any other means specific to its function. * request from an internal buffer or any other means specific to its function.
* *
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment