videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-11 20:05:06 +02:00
Code Releases Activity

lavfi: disallow ff_request_frame for filters using activate.

Browse Source 
Having two different functions allows to have stricter tests
and detect errors earlier.
This commit is contained in:
Nicolas George 2016-12-24 13:16:15 +01:00
parent 9eb4c79afd
commit ae4650f0b9
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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);
av_assert1(!link->dst->filter->activate);
if (link->status_out)
return link->status_out;
if (link->status_in) {

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