ffmpeg | branch: master | Mark Thompson <s...@jkqxz.net> | Sun Jun 24 19:25:37 2018 +0100| [d4d29052c3ce585526f06e802839e805495a5353] | committer: Mark Thompson
lavfi/framesync: Add namespace prefix to framesync_get_class > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d4d29052c3ce585526f06e802839e805495a5353 --- libavfilter/framesync.c | 2 +- libavfilter/framesync.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavfilter/framesync.c b/libavfilter/framesync.c index da12c58a61..22d3f091a3 100644 --- a/libavfilter/framesync.c +++ b/libavfilter/framesync.c @@ -61,7 +61,7 @@ enum { static int consume_from_fifos(FFFrameSync *fs); -const AVClass *framesync_get_class(void) +const AVClass *ff_framesync_get_class(void) { return &framesync_class; } diff --git a/libavfilter/framesync.h b/libavfilter/framesync.h index abf3bf552b..37743cccb7 100644 --- a/libavfilter/framesync.h +++ b/libavfilter/framesync.h @@ -211,7 +211,7 @@ typedef struct FFFrameSync { /** * Get the class for the framesync object. */ -const AVClass *framesync_get_class(void); +const AVClass *ff_framesync_get_class(void); /** * Pre-initialize a frame sync structure. @@ -304,11 +304,11 @@ static int name##_framesync_preinit(AVFilterContext *ctx) { \ return 0; \ } \ static const AVClass *name##_child_class_next(const AVClass *prev) { \ - return prev ? NULL : framesync_get_class(); \ + return prev ? NULL : ff_framesync_get_class(); \ } \ static void *name##_child_next(void *obj, void *prev) { \ context *s = obj; \ - s->fs.class = framesync_get_class(); /* FIXME */ \ + s->fs.class = ff_framesync_get_class(); /* FIXME */ \ return prev ? NULL : &s->field; \ } \ static const AVClass name##_class = { \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog