diff mbox

[FFmpeg-devel,14/17] lavfi: disallow ff_request_frame for filters using activate.

Message ID 20161224174149.8995-15-george@nsup.org
State Accepted
Commit ae4650f0b9cbb96b868038bafe632614832fe86f
Headers show

Commit Message

Nicolas George Dec. 24, 2016, 5:41 p.m. UTC 
Having two different functions allows to have stricter tests
and detect errors earlier.

Signed-off-by: Nicolas George <george@nsup.org>
---
 libavfilter/avfilter.c | 1 +
 libavfilter/internal.h | 3 +++
 2 files changed, 4 insertions(+)
diff mbox

Patch

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index c3e30b80b7..bacf6dc055 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -407,6 +407,7 @@  int ff_request_frame(AVFilterLink *link)
 {
     FF_TPRINTF_START(NULL, request_frame); ff_tlog_link(NULL, link, 1);
 
+    av_assert1(!link->dst->filter->activate);
     if (link->status_out)
         return link->status_out;
     if (link->status_in) {
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 44d2fa38d5..a140617b68 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -508,6 +508,9 @@  int ff_poll_frame(AVFilterLink *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
  * request from an internal buffer or any other means specific to its function.
  *