@@ -34,10 +34,9 @@ OBJS-$(CONFIG_ACRUSHER_FILTER)               += af_acrusher.o

 OBJS-$(CONFIG_ADELAY_FILTER)                 += af_adelay.o

 OBJS-$(CONFIG_AECHO_FILTER)                  += af_aecho.o

 OBJS-$(CONFIG_AEMPHASIS_FILTER)              += af_aemphasis.o

-OBJS-$(CONFIG_AFFTFILT_FILTER)               += af_afftfilt.o window_func.o

-OBJS-$(CONFIG_ANEQUALIZER_FILTER)            += af_anequalizer.o

 OBJS-$(CONFIG_AEVAL_FILTER)                  += aeval.o

 OBJS-$(CONFIG_AFADE_FILTER)                  += af_afade.o

+OBJS-$(CONFIG_AFFTFILT_FILTER)               += af_afftfilt.o window_func.o

 OBJS-$(CONFIG_AFORMAT_FILTER)                += af_aformat.o

 OBJS-$(CONFIG_AGATE_FILTER)                  += af_agate.o

 OBJS-$(CONFIG_AINTERLEAVE_FILTER)            += f_interleave.o

@@ -47,6 +46,7 @@ OBJS-$(CONFIG_ALOOP_FILTER)                  += f_loop.o

 OBJS-$(CONFIG_AMERGE_FILTER)                 += af_amerge.o

 OBJS-$(CONFIG_AMETADATA_FILTER)              += f_metadata.o

 OBJS-$(CONFIG_AMIX_FILTER)                   += af_amix.o

+OBJS-$(CONFIG_ANEQUALIZER_FILTER)            += af_anequalizer.o

 OBJS-$(CONFIG_ANULL_FILTER)                  += af_anull.o

 OBJS-$(CONFIG_APAD_FILTER)                   += af_apad.o

 OBJS-$(CONFIG_APERMS_FILTER)                 += f_perms.o

@@ -88,6 +88,7 @@ OBJS-$(CONFIG_EQUALIZER_FILTER)              += af_biquads.o

 OBJS-$(CONFIG_EXTRASTEREO_FILTER)            += af_extrastereo.o

 OBJS-$(CONFIG_FIREQUALIZER_FILTER)           += af_firequalizer.o

 OBJS-$(CONFIG_FLANGER_FILTER)                += af_flanger.o generate_wave_table.o

+OBJS-$(CONFIG_HDCD_FILTER)                   += af_hdcd.o

 OBJS-$(CONFIG_HIGHPASS_FILTER)               += af_biquads.o

 OBJS-$(CONFIG_JOIN_FILTER)                   += af_join.o

 OBJS-$(CONFIG_LADSPA_FILTER)                 += af_ladspa.o

@@ -109,7 +110,6 @@ OBJS-$(CONFIG_TREMOLO_FILTER)                += af_tremolo.o

 OBJS-$(CONFIG_VIBRATO_FILTER)                += af_vibrato.o generate_wave_table.o

 OBJS-$(CONFIG_VOLUME_FILTER)                 += af_volume.o

 OBJS-$(CONFIG_VOLUMEDETECT_FILTER)           += af_volumedetect.o

-OBJS-$(CONFIG_HDCD_FILTER)                   += af_hdcd.o

 OBJS-$(CONFIG_AEVALSRC_FILTER)               += aeval.o

 OBJS-$(CONFIG_ANOISESRC_FILTER)              += asrc_anoisesrc.o

@@ -119,16 +119,15 @@ OBJS-$(CONFIG_SINE_FILTER)                   += asrc_sine.o

 OBJS-$(CONFIG_ANULLSINK_FILTER)              += asink_anullsink.o

 OBJS-$(CONFIG_ANULLSRC_FILTER)               += asrc_anullsrc.o

-OBJS-$(CONFIG_ASS_FILTER)                    += vf_subtitles.o

+# video filters

 OBJS-$(CONFIG_ALPHAEXTRACT_FILTER)           += vf_extractplanes.o

 OBJS-$(CONFIG_ALPHAMERGE_FILTER)             += vf_alphamerge.o

+OBJS-$(CONFIG_ASS_FILTER)                    += vf_subtitles.o

 OBJS-$(CONFIG_ATADENOISE_FILTER)             += vf_atadenoise.o

 OBJS-$(CONFIG_BBOX_FILTER)                   += bbox.o vf_bbox.o

 OBJS-$(CONFIG_BENCH_FILTER)                  += f_bench.o

 OBJS-$(CONFIG_BITPLANENOISE_FILTER)          += vf_bitplanenoise.o

 OBJS-$(CONFIG_BLACKDETECT_FILTER)            += vf_blackdetect.o

-

-# video filters

 OBJS-$(CONFIG_BLACKFRAME_FILTER)             += vf_blackframe.o

 OBJS-$(CONFIG_BLEND_FILTER)                  += vf_blend.o dualinput.o framesync.o

 OBJS-$(CONFIG_BOXBLUR_FILTER)                += vf_boxblur.o

@@ -164,8 +163,8 @@ OBJS-$(CONFIG_DRAWBOX_FILTER)                += vf_drawbox.o

 OBJS-$(CONFIG_DRAWGRAPH_FILTER)              += f_drawgraph.o

 OBJS-$(CONFIG_DRAWGRID_FILTER)               += vf_drawbox.o

 OBJS-$(CONFIG_DRAWTEXT_FILTER)               += vf_drawtext.o

-OBJS-$(CONFIG_ELBG_FILTER)                   += vf_elbg.o

 OBJS-$(CONFIG_EDGEDETECT_FILTER)             += vf_edgedetect.o

+OBJS-$(CONFIG_ELBG_FILTER)                   += vf_elbg.o

 OBJS-$(CONFIG_EQ_FILTER)                     += vf_eq.o

 OBJS-$(CONFIG_EROSION_FILTER)                += vf_neighbor.o

 OBJS-$(CONFIG_EXTRACTPLANES_FILTER)          += vf_extractplanes.o

@@ -191,11 +190,11 @@ OBJS-$(CONFIG_HISTEQ_FILTER)                 += vf_histeq.o

 OBJS-$(CONFIG_HISTOGRAM_FILTER)              += vf_histogram.o

 OBJS-$(CONFIG_HQDN3D_FILTER)                 += vf_hqdn3d.o

 OBJS-$(CONFIG_HQX_FILTER)                    += vf_hqx.o

+OBJS-$(CONFIG_HSTACK_FILTER)                 += vf_stack.o framesync.o

+OBJS-$(CONFIG_HUE_FILTER)                    += vf_hue.o

 OBJS-$(CONFIG_HWDOWNLOAD_FILTER)             += vf_hwdownload.o

 OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER)          += vf_hwupload_cuda.o

 OBJS-$(CONFIG_HWUPLOAD_FILTER)               += vf_hwupload.o

-OBJS-$(CONFIG_HSTACK_FILTER)                 += vf_stack.o framesync.o

-OBJS-$(CONFIG_HUE_FILTER)                    += vf_hue.o

 OBJS-$(CONFIG_IDET_FILTER)                   += vf_idet.o

 OBJS-$(CONFIG_IL_FILTER)                     += vf_il.o

 OBJS-$(CONFIG_INFLATE_FILTER)                += vf_neighbor.o

@@ -204,8 +203,8 @@ OBJS-$(CONFIG_INTERLEAVE_FILTER)             += f_interleave.o

 OBJS-$(CONFIG_KERNDEINT_FILTER)              += vf_kerndeint.o

 OBJS-$(CONFIG_LENSCORRECTION_FILTER)         += vf_lenscorrection.o

 OBJS-$(CONFIG_LOOP_FILTER)                   += f_loop.o

-OBJS-$(CONFIG_LUT3D_FILTER)                  += vf_lut3d.o

 OBJS-$(CONFIG_LUT_FILTER)                    += vf_lut.o

+OBJS-$(CONFIG_LUT3D_FILTER)                  += vf_lut3d.o

 OBJS-$(CONFIG_LUTRGB_FILTER)                 += vf_lut.o

 OBJS-$(CONFIG_LUTYUV_FILTER)                 += vf_lut.o

 OBJS-$(CONFIG_MASKEDMERGE_FILTER)            += vf_maskedmerge.o framesync.o

@@ -244,15 +243,15 @@ OBJS-$(CONFIG_REMOVELOGO_FILTER)             += bbox.o lswsutils.o lavfutils.o v

 OBJS-$(CONFIG_REPEATFIELDS_FILTER)           += vf_repeatfields.o

 OBJS-$(CONFIG_REVERSE_FILTER)                += f_reverse.o

 OBJS-$(CONFIG_ROTATE_FILTER)                 += vf_rotate.o

-OBJS-$(CONFIG_SEPARATEFIELDS_FILTER)         += vf_separatefields.o

 OBJS-$(CONFIG_SAB_FILTER)                    += vf_sab.o

 OBJS-$(CONFIG_SCALE_FILTER)                  += vf_scale.o

+OBJS-$(CONFIG_SCALE_NPP_FILTER)              += vf_scale_npp.o

+OBJS-$(CONFIG_SCALE_VAAPI_FILTER)            += vf_scale_vaapi.o

 OBJS-$(CONFIG_SCALE2REF_FILTER)              += vf_scale.o

 OBJS-$(CONFIG_SELECT_FILTER)                 += f_select.o

 OBJS-$(CONFIG_SELECTIVECOLOR_FILTER)         += vf_selectivecolor.o

 OBJS-$(CONFIG_SENDCMD_FILTER)                += f_sendcmd.o

-OBJS-$(CONFIG_SCALE_NPP_FILTER)              += vf_scale_npp.o

-OBJS-$(CONFIG_SCALE_VAAPI_FILTER)            += vf_scale_vaapi.o

+OBJS-$(CONFIG_SEPARATEFIELDS_FILTER)         += vf_separatefields.o

 OBJS-$(CONFIG_SETDAR_FILTER)                 += vf_aspect.o

 OBJS-$(CONFIG_SETFIELD_FILTER)               += vf_setfield.o

 OBJS-$(CONFIG_SETPTS_FILTER)                 += setpts.o

@@ -139,10 +139,10 @@ void avfilter_register_all(void)

     REGISTER_FILTER(ALPHAEXTRACT,   alphaextract,   vf);

     REGISTER_FILTER(ALPHAMERGE,     alphamerge,     vf);

-    REGISTER_FILTER(ATADENOISE,     atadenoise,     vf);

     REGISTER_FILTER(ASS,            ass,            vf);

-    REGISTER_FILTER(BENCH,          bench,          vf);

+    REGISTER_FILTER(ATADENOISE,     atadenoise,     vf);

     REGISTER_FILTER(BBOX,           bbox,           vf);

+    REGISTER_FILTER(BENCH,          bench,          vf);

     REGISTER_FILTER(BITPLANENOISE,  bitplanenoise,  vf);

     REGISTER_FILTER(BLACKDETECT,    blackdetect,    vf);

     REGISTER_FILTER(BLACKFRAME,     blackframe,     vf);

@@ -207,11 +207,11 @@ void avfilter_register_all(void)

     REGISTER_FILTER(HISTOGRAM,      histogram,      vf);

     REGISTER_FILTER(HQDN3D,         hqdn3d,         vf);

     REGISTER_FILTER(HQX,            hqx,            vf);

+    REGISTER_FILTER(HSTACK,         hstack,         vf);

+    REGISTER_FILTER(HUE,            hue,            vf);

     REGISTER_FILTER(HWDOWNLOAD,     hwdownload,     vf);

     REGISTER_FILTER(HWUPLOAD,       hwupload,       vf);

     REGISTER_FILTER(HWUPLOAD_CUDA,  hwupload_cuda,  vf);

-    REGISTER_FILTER(HSTACK,         hstack,         vf);

-    REGISTER_FILTER(HUE,            hue,            vf);

     REGISTER_FILTER(IDET,           idet,           vf);

     REGISTER_FILTER(IL,             il,             vf);

     REGISTER_FILTER(INFLATE,        inflate,        vf);

@@ -220,8 +220,8 @@ void avfilter_register_all(void)

     REGISTER_FILTER(KERNDEINT,      kerndeint,      vf);

     REGISTER_FILTER(LENSCORRECTION, lenscorrection, vf);

     REGISTER_FILTER(LOOP,           loop,           vf);

-    REGISTER_FILTER(LUT3D,          lut3d,          vf);

     REGISTER_FILTER(LUT,            lut,            vf);

+    REGISTER_FILTER(LUT3D,          lut3d,          vf);

     REGISTER_FILTER(LUTRGB,         lutrgb,         vf);

     REGISTER_FILTER(LUTYUV,         lutyuv,         vf);

     REGISTER_FILTER(MASKEDMERGE,    maskedmerge,    vf);

@@ -261,9 +261,9 @@ void avfilter_register_all(void)

     REGISTER_FILTER(ROTATE,         rotate,         vf);

     REGISTER_FILTER(SAB,            sab,            vf);

     REGISTER_FILTER(SCALE,          scale,          vf);

-    REGISTER_FILTER(SCALE2REF,      scale2ref,      vf);

     REGISTER_FILTER(SCALE_NPP,      scale_npp,      vf);

     REGISTER_FILTER(SCALE_VAAPI,    scale_vaapi,    vf);

+    REGISTER_FILTER(SCALE2REF,      scale2ref,      vf);

     REGISTER_FILTER(SELECT,         select,         vf);

     REGISTER_FILTER(SELECTIVECOLOR, selectivecolor, vf);

     REGISTER_FILTER(SENDCMD,        sendcmd,        vf);