breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

lavfi: get rid of FF_INTERNAL_FIELDS

Browse Source 
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.
This commit is contained in:
Anton Khirnov
2022-10-25 15:36:36 +02:00
parent 1e7d2007c3
commit 86417b759f
6 changed files with 198 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/avfiltergraph.c
View File

@@ -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;