History

avfilter/Makefile & allfilters: sort entries

Paul B Mahol committed 10 years ago

Commit d299def1 parent ed8d7e72 files · +18 −19Browse files

Unified · Split

2 files
  1. libavfilter/Makefile +12 −13
  2. libavfilter/allfilters.c +6 −6
libavfilter/Makefile+12−13
@@ -34,10 +34,9 @@ OBJS-$(CONFIG_ACRUSHER_FILTER) += af_acrusher.o · 33 unmodified lines
3434 OBJS-$(CONFIG_ADELAY_FILTER) += af_adelay.o
3535 OBJS-$(CONFIG_AECHO_FILTER) += af_aecho.o
3636 OBJS-$(CONFIG_AEMPHASIS_FILTER) += af_aemphasis.o
37−OBJS-$(CONFIG_AFFTFILT_FILTER) += af_afftfilt.o window_func.o
38−OBJS-$(CONFIG_ANEQUALIZER_FILTER) += af_anequalizer.o
3937 OBJS-$(CONFIG_AEVAL_FILTER) += aeval.o
4038 OBJS-$(CONFIG_AFADE_FILTER) += af_afade.o
39+OBJS-$(CONFIG_AFFTFILT_FILTER) += af_afftfilt.o window_func.o
4140 OBJS-$(CONFIG_AFORMAT_FILTER) += af_aformat.o
4241 OBJS-$(CONFIG_AGATE_FILTER) += af_agate.o
4342 OBJS-$(CONFIG_AINTERLEAVE_FILTER) += f_interleave.o
@@ -47,6 +46,7 @@ OBJS-$(CONFIG_ALOOP_FILTER) += f_loop.o · 3 unmodified lines
4746 OBJS-$(CONFIG_AMERGE_FILTER) += af_amerge.o
4847 OBJS-$(CONFIG_AMETADATA_FILTER) += f_metadata.o
4948 OBJS-$(CONFIG_AMIX_FILTER) += af_amix.o
49+OBJS-$(CONFIG_ANEQUALIZER_FILTER) += af_anequalizer.o
5050 OBJS-$(CONFIG_ANULL_FILTER) += af_anull.o
5151 OBJS-$(CONFIG_APAD_FILTER) += af_apad.o
5252 OBJS-$(CONFIG_APERMS_FILTER) += f_perms.o
@@ -88,6 +88,7 @@ OBJS-$(CONFIG_EQUALIZER_FILTER) += af_biquads.o · 35 unmodified lines
8888 OBJS-$(CONFIG_EXTRASTEREO_FILTER) += af_extrastereo.o
8989 OBJS-$(CONFIG_FIREQUALIZER_FILTER) += af_firequalizer.o
9090 OBJS-$(CONFIG_FLANGER_FILTER) += af_flanger.o generate_wave_table.o
91+OBJS-$(CONFIG_HDCD_FILTER) += af_hdcd.o
9192 OBJS-$(CONFIG_HIGHPASS_FILTER) += af_biquads.o
9293 OBJS-$(CONFIG_JOIN_FILTER) += af_join.o
9394 OBJS-$(CONFIG_LADSPA_FILTER) += af_ladspa.o
@@ -109,7 +110,6 @@ OBJS-$(CONFIG_TREMOLO_FILTER) += af_tremolo.o · 15 unmodified lines
109110 OBJS-$(CONFIG_VIBRATO_FILTER) += af_vibrato.o generate_wave_table.o
110111 OBJS-$(CONFIG_VOLUME_FILTER) += af_volume.o
111112 OBJS-$(CONFIG_VOLUMEDETECT_FILTER) += af_volumedetect.o
112−OBJS-$(CONFIG_HDCD_FILTER) += af_hdcd.o
113113
114114 OBJS-$(CONFIG_AEVALSRC_FILTER) += aeval.o
115115 OBJS-$(CONFIG_ANOISESRC_FILTER) += asrc_anoisesrc.o
@@ -119,16 +119,15 @@ OBJS-$(CONFIG_SINE_FILTER) += asrc_sine.o · 3 unmodified lines
119119 OBJS-$(CONFIG_ANULLSINK_FILTER) += asink_anullsink.o
120120 OBJS-$(CONFIG_ANULLSRC_FILTER) += asrc_anullsrc.o
121121
122−OBJS-$(CONFIG_ASS_FILTER) += vf_subtitles.o
122+# video filters
123123 OBJS-$(CONFIG_ALPHAEXTRACT_FILTER) += vf_extractplanes.o
124124 OBJS-$(CONFIG_ALPHAMERGE_FILTER) += vf_alphamerge.o
125+OBJS-$(CONFIG_ASS_FILTER) += vf_subtitles.o
125126 OBJS-$(CONFIG_ATADENOISE_FILTER) += vf_atadenoise.o
126127 OBJS-$(CONFIG_BBOX_FILTER) += bbox.o vf_bbox.o
127128 OBJS-$(CONFIG_BENCH_FILTER) += f_bench.o
128129 OBJS-$(CONFIG_BITPLANENOISE_FILTER) += vf_bitplanenoise.o
129130 OBJS-$(CONFIG_BLACKDETECT_FILTER) += vf_blackdetect.o
130−
131−# video filters
132131 OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o
133132 OBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o dualinput.o framesync.o
134133 OBJS-$(CONFIG_BOXBLUR_FILTER) += vf_boxblur.o
@@ -164,8 +163,8 @@ OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o · 29 unmodified lines
164163 OBJS-$(CONFIG_DRAWGRAPH_FILTER) += f_drawgraph.o
165164 OBJS-$(CONFIG_DRAWGRID_FILTER) += vf_drawbox.o
166165 OBJS-$(CONFIG_DRAWTEXT_FILTER) += vf_drawtext.o
167−OBJS-$(CONFIG_ELBG_FILTER) += vf_elbg.o
168166 OBJS-$(CONFIG_EDGEDETECT_FILTER) += vf_edgedetect.o
167+OBJS-$(CONFIG_ELBG_FILTER) += vf_elbg.o
169168 OBJS-$(CONFIG_EQ_FILTER) += vf_eq.o
170169 OBJS-$(CONFIG_EROSION_FILTER) += vf_neighbor.o
171170 OBJS-$(CONFIG_EXTRACTPLANES_FILTER) += vf_extractplanes.o
@@ -191,11 +190,11 @@ OBJS-$(CONFIG_HISTEQ_FILTER) += vf_histeq.o · 19 unmodified lines
191190 OBJS-$(CONFIG_HISTOGRAM_FILTER) += vf_histogram.o
192191 OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o
193192 OBJS-$(CONFIG_HQX_FILTER) += vf_hqx.o
193+OBJS-$(CONFIG_HSTACK_FILTER) += vf_stack.o framesync.o
194+OBJS-$(CONFIG_HUE_FILTER) += vf_hue.o
194195 OBJS-$(CONFIG_HWDOWNLOAD_FILTER) += vf_hwdownload.o
195196 OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER) += vf_hwupload_cuda.o
196197 OBJS-$(CONFIG_HWUPLOAD_FILTER) += vf_hwupload.o
197−OBJS-$(CONFIG_HSTACK_FILTER) += vf_stack.o framesync.o
198−OBJS-$(CONFIG_HUE_FILTER) += vf_hue.o
199198 OBJS-$(CONFIG_IDET_FILTER) += vf_idet.o
200199 OBJS-$(CONFIG_IL_FILTER) += vf_il.o
201200 OBJS-$(CONFIG_INFLATE_FILTER) += vf_neighbor.o
@@ -204,8 +203,8 @@ OBJS-$(CONFIG_INTERLEAVE_FILTER) += f_interleave.o · 2 unmodified lines
204203 OBJS-$(CONFIG_KERNDEINT_FILTER) += vf_kerndeint.o
205204 OBJS-$(CONFIG_LENSCORRECTION_FILTER) += vf_lenscorrection.o
206205 OBJS-$(CONFIG_LOOP_FILTER) += f_loop.o
207−OBJS-$(CONFIG_LUT3D_FILTER) += vf_lut3d.o
208206 OBJS-$(CONFIG_LUT_FILTER) += vf_lut.o
207+OBJS-$(CONFIG_LUT3D_FILTER) += vf_lut3d.o
209208 OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o
210209 OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o
211210 OBJS-$(CONFIG_MASKEDMERGE_FILTER) += vf_maskedmerge.o framesync.o
@@ -244,15 +243,15 @@ OBJS-$(CONFIG_REMOVELOGO_FILTER) += bbox.o lswsutils.o lavfutils.o v · 32 unmodified lines
244243 OBJS-$(CONFIG_REPEATFIELDS_FILTER) += vf_repeatfields.o
245244 OBJS-$(CONFIG_REVERSE_FILTER) += f_reverse.o
246245 OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o
247−OBJS-$(CONFIG_SEPARATEFIELDS_FILTER) += vf_separatefields.o
248246 OBJS-$(CONFIG_SAB_FILTER) += vf_sab.o
249247 OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o
248+OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o
249+OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o
250250 OBJS-$(CONFIG_SCALE2REF_FILTER) += vf_scale.o
251251 OBJS-$(CONFIG_SELECT_FILTER) += f_select.o
252252 OBJS-$(CONFIG_SELECTIVECOLOR_FILTER) += vf_selectivecolor.o
253253 OBJS-$(CONFIG_SENDCMD_FILTER) += f_sendcmd.o
254−OBJS-$(CONFIG_SCALE_NPP_FILTER) += vf_scale_npp.o
255−OBJS-$(CONFIG_SCALE_VAAPI_FILTER) += vf_scale_vaapi.o
254+OBJS-$(CONFIG_SEPARATEFIELDS_FILTER) += vf_separatefields.o
256255 OBJS-$(CONFIG_SETDAR_FILTER) += vf_aspect.o
257256 OBJS-$(CONFIG_SETFIELD_FILTER) += vf_setfield.o
258257 OBJS-$(CONFIG_SETPTS_FILTER) += setpts.o
libavfilter/allfilters.c+6−6
@@ -139,10 +139,10 @@ void avfilter_register_all(void) · 138 unmodified lines
139139
140140 REGISTER_FILTER(ALPHAEXTRACT, alphaextract, vf);
141141 REGISTER_FILTER(ALPHAMERGE, alphamerge, vf);
142− REGISTER_FILTER(ATADENOISE, atadenoise, vf);
143142 REGISTER_FILTER(ASS, ass, vf);
144− REGISTER_FILTER(BENCH, bench, vf);
143+ REGISTER_FILTER(ATADENOISE, atadenoise, vf);
145144 REGISTER_FILTER(BBOX, bbox, vf);
145+ REGISTER_FILTER(BENCH, bench, vf);
146146 REGISTER_FILTER(BITPLANENOISE, bitplanenoise, vf);
147147 REGISTER_FILTER(BLACKDETECT, blackdetect, vf);
148148 REGISTER_FILTER(BLACKFRAME, blackframe, vf);
@@ -207,11 +207,11 @@ void avfilter_register_all(void) · 58 unmodified lines
207207 REGISTER_FILTER(HISTOGRAM, histogram, vf);
208208 REGISTER_FILTER(HQDN3D, hqdn3d, vf);
209209 REGISTER_FILTER(HQX, hqx, vf);
210+ REGISTER_FILTER(HSTACK, hstack, vf);
211+ REGISTER_FILTER(HUE, hue, vf);
210212 REGISTER_FILTER(HWDOWNLOAD, hwdownload, vf);
211213 REGISTER_FILTER(HWUPLOAD, hwupload, vf);
212214 REGISTER_FILTER(HWUPLOAD_CUDA, hwupload_cuda, vf);
213− REGISTER_FILTER(HSTACK, hstack, vf);
214− REGISTER_FILTER(HUE, hue, vf);
215215 REGISTER_FILTER(IDET, idet, vf);
216216 REGISTER_FILTER(IL, il, vf);
217217 REGISTER_FILTER(INFLATE, inflate, vf);
@@ -220,8 +220,8 @@ void avfilter_register_all(void) · 2 unmodified lines
220220 REGISTER_FILTER(KERNDEINT, kerndeint, vf);
221221 REGISTER_FILTER(LENSCORRECTION, lenscorrection, vf);
222222 REGISTER_FILTER(LOOP, loop, vf);
223− REGISTER_FILTER(LUT3D, lut3d, vf);
224223 REGISTER_FILTER(LUT, lut, vf);
224+ REGISTER_FILTER(LUT3D, lut3d, vf);
225225 REGISTER_FILTER(LUTRGB, lutrgb, vf);
226226 REGISTER_FILTER(LUTYUV, lutyuv, vf);
227227 REGISTER_FILTER(MASKEDMERGE, maskedmerge, vf);
@@ -261,9 +261,9 @@ void avfilter_register_all(void) · 33 unmodified lines
261261 REGISTER_FILTER(ROTATE, rotate, vf);
262262 REGISTER_FILTER(SAB, sab, vf);
263263 REGISTER_FILTER(SCALE, scale, vf);
264− REGISTER_FILTER(SCALE2REF, scale2ref, vf);
265264 REGISTER_FILTER(SCALE_NPP, scale_npp, vf);
266265 REGISTER_FILTER(SCALE_VAAPI, scale_vaapi, vf);
266+ REGISTER_FILTER(SCALE2REF, scale2ref, vf);
267267 REGISTER_FILTER(SELECT, select, vf);
268268 REGISTER_FILTER(SELECTIVECOLOR, selectivecolor, vf);
269269 REGISTER_FILTER(SENDCMD, sendcmd, vf);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t