MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avfilter/framesync: Remove redundant setting of AVClass 

Every filter exposing the framesync options via its child_next
callback already calls framesync_preinit() in its preinit callback.
So the filter is already preinited whenever its child_next is called.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-11 19:29:34 +02:00
parent c1b6165b73
commit d6f4b91ba5
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/framesync.c
View File

@ -68,11 +68,6 @@ enum {
static int consume_from_fifos(FFFrameSync *fs); static int consume_from_fifos(FFFrameSync *fs);
const AVClass *ff_framesync_get_class(void)
{
return &framesync_class;
}
void ff_framesync_preinit(FFFrameSync *fs) void ff_framesync_preinit(FFFrameSync *fs)
{ {
if (fs->class) if (fs->class)

9
libavfilter/framesync.h
View File

@ -208,11 +208,6 @@ typedef struct FFFrameSync {
} FFFrameSync; } FFFrameSync;
/**
* Get the class for the framesync object.
*/
const AVClass *ff_framesync_get_class(void);
/** /**
* Pre-initialize a frame sync structure. * Pre-initialize a frame sync structure.
* *
@ -310,6 +305,9 @@ static const AVClass name##_class = { \
.child_next = func_prefix##_child_next, \ .child_next = func_prefix##_child_next, \
} }
/* A filter that uses the *_child_next-function from this macro
* is required to initialize the FFFrameSync structure in AVFilter.preinit
* via the *_framesync_preinit function defined alongside it. */
#define FRAMESYNC_AUXILIARY_FUNCS(func_prefix, context, field) \ #define FRAMESYNC_AUXILIARY_FUNCS(func_prefix, context, field) \
static int func_prefix##_framesync_preinit(AVFilterContext *ctx) \ static int func_prefix##_framesync_preinit(AVFilterContext *ctx) \
{ \ { \
@ -320,7 +318,6 @@ static int func_prefix##_framesync_preinit(AVFilterContext *ctx) \
static void *func_prefix##_child_next(void *obj, void *prev) \ static void *func_prefix##_child_next(void *obj, void *prev) \
{ \ { \
context *s = obj; \ context *s = obj; \
s->fs.class = ff_framesync_get_class(); /* FIXME */ \
return prev ? NULL : &s->field; \ return prev ? NULL : &s->field; \
} }