diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-10-25 15:36:36 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2024-02-14 15:08:49 +0100 |
| commit | 86417b759f789383ab658e2eb90890477a79eedf (patch) | |
| tree | dc2acc804265c4e6c5283daf83f49df006c3e6f3 /libavfilter/avfiltergraph.c | |
| parent | 1e7d2007c3aca1cc1cd3b1ca409f4ded6c885f86 (diff) | |
| download | ffmpeg-86417b759f789383ab658e2eb90890477a79eedf.tar.gz | |
lavfi: get rid of FF_INTERNAL_FIELDS
This hack is used to limit the visibility of some AVFilterLink fields to
only certain files. Replace it with the same pattern that is used e.g.
in lavf AVStream/FFStream and avoid exposing these internal fields in a
public header completely.
Diffstat (limited to 'libavfilter/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 063712c539..ea0d7713e3 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -32,13 +32,13 @@ #include "libavutil/opt.h" #include "libavutil/pixdesc.h" -#define FF_INTERNAL_FIELDS 1 -#include "framequeue.h" #include "avfilter.h" #include "buffersink.h" #include "formats.h" +#include "framequeue.h" #include "internal.h" +#include "link_internal.h" #include "thread.h" #define OFFSET(x) offsetof(AVFilterGraph, x) @@ -1483,10 +1483,11 @@ int avfilter_graph_request_oldest(AVFilterGraph *graph) av_assert1(oldest->age_index >= 0); frame_count = oldest->frame_count_out; while (frame_count == oldest->frame_count_out) { + FilterLinkInternal * const li = ff_link_internal(oldest); r = ff_filter_graph_run_once(graph); if (r == AVERROR(EAGAIN) && - !oldest->frame_wanted_out && !oldest->frame_blocked_in && - !oldest->status_in) + !oldest->frame_wanted_out && !li->frame_blocked_in && + !li->status_in) ff_request_frame(oldest); else if (r < 0) return r; |