Browse Source

lavfi: disallow ff_request_frame for filters using activate.

Having two different functions allows to have stricter tests
and detect errors earlier.
tags/n3.3
Nicolas George 8 years ago
parent
commit
ae4650f0b9
2 changed files with 4 additions and 0 deletions
  1. +1
    -0
      libavfilter/avfilter.c
  2. +3
    -0
      libavfilter/internal.h

+ 1
- 0
libavfilter/avfilter.c View File

@@ -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) {


+ 3
- 0
libavfilter/internal.h View File

@@ -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.
* *


Loading…
Cancel
Save