[FFmpeg-cvslog] avfilter/f_perms: Deduplicate AVClasses

Andreas Rheinhardt git at videolan.org
Sun Sep 19 06:13:44 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Fri Sep 10 22:18:12 2021 +0200| [8435cf2307ce7c79f43767fe16195458b1c74622] | committer: Andreas Rheinhardt

avfilter/f_perms: Deduplicate AVClasses

Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8435cf2307ce7c79f43767fe16195458b1c74622
---

 libavfilter/f_perms.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/libavfilter/f_perms.c b/libavfilter/f_perms.c
index 8c449fbdfc..470db45bee 100644
--- a/libavfilter/f_perms.c
+++ b/libavfilter/f_perms.c
@@ -111,10 +111,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
     return ret;
 }
 
-#if CONFIG_APERMS_FILTER
+AVFILTER_DEFINE_CLASS_EXT(perms, "(a)perms", options);
 
-#define aperms_options options
-AVFILTER_DEFINE_CLASS(aperms);
+#if CONFIG_APERMS_FILTER
 
 static const AVFilterPad aperms_inputs[] = {
     {
@@ -134,20 +133,17 @@ static const AVFilterPad aperms_outputs[] = {
 const AVFilter ff_af_aperms = {
     .name        = "aperms",
     .description = NULL_IF_CONFIG_SMALL("Set permissions for the output audio frame."),
+    .priv_class  = &perms_class,
     .init        = init,
     .priv_size   = sizeof(PermsContext),
     FILTER_INPUTS(aperms_inputs),
     FILTER_OUTPUTS(aperms_outputs),
-    .priv_class  = &aperms_class,
     .flags       = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
 };
 #endif /* CONFIG_APERMS_FILTER */
 
 #if CONFIG_PERMS_FILTER
 
-#define perms_options options
-AVFILTER_DEFINE_CLASS(perms);
-
 static const AVFilterPad perms_inputs[] = {
     {
         .name         = "default",



More information about the ffmpeg-cvslog mailing list