Skip to content

Commit ca5ec2b

Browse files
dwbuitendwbuiten
committed
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec': build: miscellaneous cosmetics Merged-by: Derek Buitenhuis <[email protected]>
2 parents 1a3cff4 + 0162120 commit ca5ec2b

File tree

17 files changed

+139
-76
lines changed

17 files changed

+139
-76
lines changed

‎Makefile

+7-6
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ $(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog) += cmdutils.o))
3030
$(foreach prog,$(AVBASENAMES),$(eval OBJS-$(prog)-$(CONFIG_OPENCL) += cmdutils_opencl.o))
3131

3232
OBJS-ffmpeg += ffmpeg_opt.o ffmpeg_filter.o
33-
OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o
34-
OBJS-ffmpeg-$(HAVE_DXVA2_LIB) += ffmpeg_dxva2.o
35-
ifndef CONFIG_VIDEOTOOLBOX
36-
OBJS-ffmpeg-$(CONFIG_VDA) += ffmpeg_videotoolbox.o
37-
endif
3833
OBJS-ffmpeg-$(CONFIG_VIDEOTOOLBOX) += ffmpeg_videotoolbox.o
3934
OBJS-ffmpeg-$(CONFIG_LIBMFX) += ffmpeg_qsv.o
4035
OBJS-ffmpeg-$(CONFIG_VAAPI) += ffmpeg_vaapi.o
36+
ifndef CONFIG_VIDEOTOOLBOX
37+
OBJS-ffmpeg-$(CONFIG_VDA) += ffmpeg_videotoolbox.o
38+
endif
39+
OBJS-ffmpeg-$(HAVE_DXVA2_LIB) += ffmpeg_dxva2.o
40+
OBJS-ffmpeg-$(HAVE_VDPAU_X11) += ffmpeg_vdpau.o
4141
OBJS-ffserver += ffserver_config.o
4242

4343
TESTTOOLS = audiogen videogen rotozoom tiny_psnr tiny_ssim base64 audiomatch
@@ -60,7 +60,8 @@ FFLIBS := avutil
6060
DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd
6161
EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/Makefile $(SRC_PATH)/doc/examples/README
6262

63-
SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h
63+
SKIPHEADERS = cmdutils_common_opts.h \
64+
compat/w32pthreads.h
6465

6566
include $(SRC_PATH)/common.mak
6667

‎libavcodec/Makefile

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ NAME = avcodec
55
HEADERS = avcodec.h \
66
avdct.h \
77
avfft.h \
8-
dv_profile.h \
98
d3d11va.h \
109
dirac.h \
10+
dv_profile.h \
1111
dxva2.h \
1212
jni.h \
1313
qsv.h \
@@ -225,9 +225,9 @@ OBJS-$(CONFIG_CINEPAK_ENCODER) += cinepakenc.o elbg.o
225225
OBJS-$(CONFIG_CLJR_DECODER) += cljrdec.o
226226
OBJS-$(CONFIG_CLJR_ENCODER) += cljrenc.o
227227
OBJS-$(CONFIG_CLLC_DECODER) += cllc.o canopus.o
228-
OBJS-$(CONFIG_COOK_DECODER) += cook.o
229228
OBJS-$(CONFIG_COMFORTNOISE_DECODER) += cngdec.o celp_filters.o
230229
OBJS-$(CONFIG_COMFORTNOISE_ENCODER) += cngenc.o
230+
OBJS-$(CONFIG_COOK_DECODER) += cook.o
231231
OBJS-$(CONFIG_CPIA_DECODER) += cpia.o
232232
OBJS-$(CONFIG_CSCD_DECODER) += cscd.o
233233
OBJS-$(CONFIG_CYUV_DECODER) += cyuv.o
@@ -392,20 +392,20 @@ OBJS-$(CONFIG_MPC8_DECODER) += mpc8.o mpc.o
392392
OBJS-$(CONFIG_MPEGVIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
393393
OBJS-$(CONFIG_MPEG1VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
394394
OBJS-$(CONFIG_MPEG1VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
395-
OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
396-
OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
397395
OBJS-$(CONFIG_MPEG2_MMAL_DECODER) += mmaldec.o
398396
OBJS-$(CONFIG_MPEG2_QSV_DECODER) += qsvdec_mpeg2.o
399397
OBJS-$(CONFIG_MPEG2_QSV_ENCODER) += qsvenc_mpeg2.o
398+
OBJS-$(CONFIG_MPEG2VIDEO_DECODER) += mpeg12dec.o mpeg12.o mpeg12data.o
399+
OBJS-$(CONFIG_MPEG2VIDEO_ENCODER) += mpeg12enc.o mpeg12.o
400400
OBJS-$(CONFIG_MPEG4_DECODER) += xvididct.o
401401
OBJS-$(CONFIG_MPL2_DECODER) += mpl2dec.o ass.o
402+
OBJS-$(CONFIG_MSA1_DECODER) += mss3.o
402403
OBJS-$(CONFIG_MSMPEG4V1_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o
403404
OBJS-$(CONFIG_MSMPEG4V2_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o
404405
OBJS-$(CONFIG_MSMPEG4V2_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o
405406
OBJS-$(CONFIG_MSMPEG4V3_DECODER) += msmpeg4dec.o msmpeg4.o msmpeg4data.o
406407
OBJS-$(CONFIG_MSMPEG4V3_ENCODER) += msmpeg4enc.o msmpeg4.o msmpeg4data.o
407408
OBJS-$(CONFIG_MSRLE_DECODER) += msrle.o msrledec.o
408-
OBJS-$(CONFIG_MSA1_DECODER) += mss3.o
409409
OBJS-$(CONFIG_MSS1_DECODER) += mss1.o mss12.o
410410
OBJS-$(CONFIG_MSS2_DECODER) += mss2.o mss12.o mss2dsp.o wmv2data.o
411411
OBJS-$(CONFIG_MSVIDEO1_DECODER) += msvideo1.o
@@ -544,13 +544,13 @@ OBJS-$(CONFIG_UTVIDEO_DECODER) += utvideodec.o utvideo.o
544544
OBJS-$(CONFIG_UTVIDEO_ENCODER) += utvideoenc.o utvideo.o
545545
OBJS-$(CONFIG_V210_DECODER) += v210dec.o
546546
OBJS-$(CONFIG_V210_ENCODER) += v210enc.o
547+
OBJS-$(CONFIG_V210X_DECODER) += v210x.o
547548
OBJS-$(CONFIG_V308_DECODER) += v308dec.o
548549
OBJS-$(CONFIG_V308_ENCODER) += v308enc.o
549550
OBJS-$(CONFIG_V408_DECODER) += v408dec.o
550551
OBJS-$(CONFIG_V408_ENCODER) += v408enc.o
551552
OBJS-$(CONFIG_V410_DECODER) += v410dec.o
552553
OBJS-$(CONFIG_V410_ENCODER) += v410enc.o
553-
OBJS-$(CONFIG_V210X_DECODER) += v210x.o
554554
OBJS-$(CONFIG_VB_DECODER) += vb.o
555555
OBJS-$(CONFIG_VBLE_DECODER) += vble.o
556556
OBJS-$(CONFIG_VC1_DECODER) += vc1dec.o vc1_block.o vc1_loopfilter.o \
@@ -599,8 +599,8 @@ OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2data.o \
599599
OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2data.o \
600600
msmpeg4.o msmpeg4enc.o msmpeg4data.o
601601
OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o
602-
OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o
603602
OBJS-$(CONFIG_WRAPPED_AVFRAME_ENCODER) += wrapped_avframe.o
603+
OBJS-$(CONFIG_WS_SND1_DECODER) += ws-snd1.o
604604
OBJS-$(CONFIG_XAN_DPCM_DECODER) += dpcm.o
605605
OBJS-$(CONFIG_XAN_WC3_DECODER) += xan.o
606606
OBJS-$(CONFIG_XAN_WC4_DECODER) += xxan.o
@@ -788,9 +788,9 @@ OBJS-$(CONFIG_LATM_MUXER) += mpeg4audio.o
788788
OBJS-$(CONFIG_MATROSKA_AUDIO_MUXER) += mpeg4audio.o vorbis_data.o \
789789
flac.o flacdata.o
790790
OBJS-$(CONFIG_MATROSKA_MUXER) += flac.o flacdata.o vorbis_data.o
791+
OBJS-$(CONFIG_MOV_DEMUXER) += ac3tab.o
791792
OBJS-$(CONFIG_MP2_MUXER) += mpegaudiodata.o mpegaudiodecheader.o
792793
OBJS-$(CONFIG_MP3_MUXER) += mpegaudiodata.o mpegaudiodecheader.o
793-
OBJS-$(CONFIG_MOV_DEMUXER) += ac3tab.o
794794
OBJS-$(CONFIG_MPEGTS_MUXER) += mpeg4audio.o
795795
OBJS-$(CONFIG_MXF_MUXER) += dnxhddata.o
796796
OBJS-$(CONFIG_NUT_MUXER) += mpegaudiodata.o
@@ -884,9 +884,9 @@ OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o
884884
OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o
885885

886886
# parsers
887+
OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o
887888
OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \
888889
aacadtsdec.o mpeg4audio.o
889-
OBJS-$(CONFIG_AAC_LATM_PARSER) += latm_parser.o
890890
OBJS-$(CONFIG_AC3_PARSER) += ac3_parser.o ac3tab.o \
891891
aac_ac3_parser.o
892892
OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o
@@ -997,10 +997,10 @@ TESTPROGS = imgconvert \
997997

998998
TESTPROGS-$(CONFIG_CABAC) += cabac
999999
TESTPROGS-$(CONFIG_FFT) += fft fft-fixed fft-fixed32
1000+
TESTPROGS-$(CONFIG_GOLOMB) += golomb
10001001
TESTPROGS-$(CONFIG_IDCTDSP) += dct
10011002
TESTPROGS-$(CONFIG_IIRFILTER) += iirfilter
10021003
TESTPROGS-$(HAVE_MMX) += motion
1003-
TESTPROGS-$(CONFIG_GOLOMB) += golomb
10041004
TESTPROGS-$(CONFIG_RANGECODER) += rangecoder
10051005
TESTPROGS-$(CONFIG_SNOW_ENCODER) += snowenc
10061006

@@ -1054,11 +1054,11 @@ $(SUBDIR)aacps_float.o: $(SUBDIR)aacps_tables.h
10541054
$(SUBDIR)aacps_fixed.o: $(SUBDIR)aacps_fixed_tables.h
10551055
$(SUBDIR)aactab_fixed.o: $(SUBDIR)aac_fixed_tables.h
10561056
$(SUBDIR)dvenc.o: $(SUBDIR)dv_tables.h
1057-
$(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h
1058-
$(SUBDIR)sinewin_fixed.o: $(SUBDIR)sinewin_fixed_tables.h
1057+
$(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h
10591058
$(SUBDIR)mpegaudiodec_fixed.o: $(SUBDIR)mpegaudio_tables.h
10601059
$(SUBDIR)mpegaudiodec_float.o: $(SUBDIR)mpegaudio_tables.h
1061-
$(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.h
10621060
$(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h
10631061
$(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h
1062+
$(SUBDIR)sinewin.o: $(SUBDIR)sinewin_tables.h
1063+
$(SUBDIR)sinewin_fixed.o: $(SUBDIR)sinewin_fixed_tables.h
10641064
endif

‎libavcodec/aarch64/Makefile

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
OBJS-$(CONFIG_DCA_DECODER) += aarch64/synth_filter_init.o
1+
# subsystems
22
OBJS-$(CONFIG_FFT) += aarch64/fft_init_aarch64.o
33
OBJS-$(CONFIG_FMTCONVERT) += aarch64/fmtconvert_init.o
44
OBJS-$(CONFIG_H264CHROMA) += aarch64/h264chroma_init_aarch64.o
@@ -11,13 +11,20 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_init.o
1111
OBJS-$(CONFIG_NEON_CLOBBER_TEST) += aarch64/neontest.o
1212
OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp_init.o
1313

14+
# decoders/encoders
15+
OBJS-$(CONFIG_DCA_DECODER) += aarch64/dcadsp_init.o
1416
OBJS-$(CONFIG_RV40_DECODER) += aarch64/rv40dsp_init_aarch64.o
1517
OBJS-$(CONFIG_VC1_DECODER) += aarch64/vc1dsp_init_aarch64.o
1618
OBJS-$(CONFIG_VORBIS_DECODER) += aarch64/vorbisdsp_init.o
1719

20+
# ARMv8 optimizations
21+
22+
# subsystems
1823
ARMV8-OBJS-$(CONFIG_VIDEODSP) += aarch64/videodsp.o
1924

20-
NEON-OBJS-$(CONFIG_DCA_DECODER) += aarch64/synth_filter_neon.o
25+
# NEON optimizations
26+
27+
# subsystems
2128
NEON-OBJS-$(CONFIG_FFT) += aarch64/fft_neon.o
2229
NEON-OBJS-$(CONFIG_FMTCONVERT) += aarch64/fmtconvert_neon.o
2330
NEON-OBJS-$(CONFIG_H264CHROMA) += aarch64/h264cmc_neon.o
@@ -28,7 +35,9 @@ NEON-OBJS-$(CONFIG_H264QPEL) += aarch64/h264qpel_neon.o \
2835
aarch64/hpeldsp_neon.o
2936
NEON-OBJS-$(CONFIG_HPELDSP) += aarch64/hpeldsp_neon.o
3037
NEON-OBJS-$(CONFIG_IMDCT15) += aarch64/imdct15_neon.o
31-
NEON-OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_neon.o
3238
NEON-OBJS-$(CONFIG_MDCT) += aarch64/mdct_neon.o
39+
NEON-OBJS-$(CONFIG_MPEGAUDIODSP) += aarch64/mpegaudiodsp_neon.o
3340

41+
# decoders/encoders
42+
NEON-OBJS-$(CONFIG_DCA_DECODER) += aarch64/synth_filter_neon.o
3443
NEON-OBJS-$(CONFIG_VORBIS_DECODER) += aarch64/vorbisdsp_neon.o

‎libavcodec/arm/Makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ OBJS-$(CONFIG_AUDIODSP) += arm/audiodsp_init_arm.o
77
OBJS-$(CONFIG_BLOCKDSP) += arm/blockdsp_init_arm.o
88
OBJS-$(CONFIG_FFT) += arm/fft_init_arm.o \
99
arm/fft_fixed_init_arm.o
10+
OBJS-$(CONFIG_FLACDSP) += arm/flacdsp_init_arm.o \
11+
arm/flacdsp_arm.o
1012
OBJS-$(CONFIG_FMTCONVERT) += arm/fmtconvert_init_arm.o
13+
OBJS-$(CONFIG_G722DSP) += arm/g722dsp_init_arm.o
1114
OBJS-$(CONFIG_H264CHROMA) += arm/h264chroma_init_arm.o
1215
OBJS-$(CONFIG_H264DSP) += arm/h264dsp_init_arm.o
1316
OBJS-$(CONFIG_H264PRED) += arm/h264pred_init_arm.o
@@ -18,9 +21,6 @@ OBJS-$(CONFIG_IDCTDSP) += arm/idctdsp_init_arm.o \
1821
arm/idctdsp_arm.o \
1922
arm/jrevdct_arm.o \
2023
arm/simple_idct_arm.o
21-
OBJS-$(CONFIG_FLACDSP) += arm/flacdsp_init_arm.o \
22-
arm/flacdsp_arm.o
23-
OBJS-$(CONFIG_G722DSP) += arm/g722dsp_init_arm.o
2424
OBJS-$(CONFIG_LLAUDDSP) += arm/lossless_audiodsp_init_arm.o
2525
OBJS-$(CONFIG_ME_CMP) += arm/me_cmp_init_arm.o
2626
OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_init_arm.o
@@ -71,13 +71,13 @@ ARMV6-OBJS-$(CONFIG_ME_CMP) += arm/me_cmp_armv6.o
7171
ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o
7272
ARMV6-OBJS-$(CONFIG_MPEGVIDEOENC) += arm/mpegvideoencdsp_armv6.o
7373
ARMV6-OBJS-$(CONFIG_PIXBLOCKDSP) += arm/pixblockdsp_armv6.o
74+
ARMV6-OBJS-$(CONFIG_STARTCODE) += arm/startcode_armv6.o
7475
ARMV6-OBJS-$(CONFIG_VP8DSP) += arm/vp8_armv6.o \
7576
arm/vp8dsp_init_armv6.o \
7677
arm/vp8dsp_armv6.o
7778

7879
# decoders/encoders
7980
ARMV6-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv6.o
80-
ARMV6-OBJS-$(CONFIG_STARTCODE) += arm/startcode_armv6.o
8181

8282

8383
# VFP optimizations

‎libavcodec/ppc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ OBJS-$(CONFIG_BLOCKDSP) += ppc/blockdsp.o
44
OBJS-$(CONFIG_FFT) += ppc/fft_init.o \
55
ppc/fft_altivec.o \
66
ppc/fft_vsx.o
7+
OBJS-$(CONFIG_FDCTDSP) += ppc/fdctdsp.o
78
OBJS-$(CONFIG_FMTCONVERT) += ppc/fmtconvert_altivec.o
89
OBJS-$(CONFIG_H264CHROMA) += ppc/h264chroma_init.o
910
OBJS-$(CONFIG_H264DSP) += ppc/h264dsp.o ppc/hpeldsp_altivec.o
1011
OBJS-$(CONFIG_H264QPEL) += ppc/h264qpel.o
1112
OBJS-$(CONFIG_HPELDSP) += ppc/hpeldsp_altivec.o
1213
OBJS-$(CONFIG_HUFFYUVDSP) += ppc/huffyuvdsp_altivec.o
13-
OBJS-$(CONFIG_FDCTDSP) += ppc/fdctdsp.o
1414
OBJS-$(CONFIG_IDCTDSP) += ppc/idctdsp.o
1515
OBJS-$(CONFIG_ME_CMP) += ppc/me_cmp.o
1616
OBJS-$(CONFIG_MPEGAUDIODSP) += ppc/mpegaudiodsp_altivec.o

‎libavdevice/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ OBJS = alldevices.o \
99
avdevice.o \
1010
utils.o \
1111

12+
OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
13+
1214
# input/output devices
1315
OBJS-$(CONFIG_ALSA_INDEV) += alsa_dec.o alsa.o timefilter.o
1416
OBJS-$(CONFIG_ALSA_OUTDEV) += alsa_enc.o alsa.o
@@ -53,8 +55,6 @@ OBJS-$(CONFIG_XV_OUTDEV) += xv.o
5355
OBJS-$(CONFIG_LIBCDIO_INDEV) += libcdio.o
5456
OBJS-$(CONFIG_LIBDC1394_INDEV) += libdc1394.o
5557

56-
OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
57-
5858
# Windows resource file
5959
SLIBOBJS-$(HAVE_GNU_WINDRES) += avdeviceres.o
6060

‎libavfilter/Makefile

+8-5
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ OBJS = allfilters.o \
2424
transform.o \
2525
video.o \
2626

27+
OBJS-$(HAVE_THREADS) += pthread.o
28+
29+
# audio filters
2730
OBJS-$(CONFIG_ABENCH_FILTER) += f_bench.o
2831
OBJS-$(CONFIG_ACOMPRESSOR_FILTER) += af_sidechaincompress.o
2932
OBJS-$(CONFIG_ACROSSFADE_FILTER) += af_afade.o
@@ -107,11 +110,11 @@ OBJS-$(CONFIG_HDCD_FILTER) += af_hdcd.o
107110

108111
OBJS-$(CONFIG_AEVALSRC_FILTER) += aeval.o
109112
OBJS-$(CONFIG_ANOISESRC_FILTER) += asrc_anoisesrc.o
110-
OBJS-$(CONFIG_ANULLSRC_FILTER) += asrc_anullsrc.o
111113
OBJS-$(CONFIG_FLITE_FILTER) += asrc_flite.o
112114
OBJS-$(CONFIG_SINE_FILTER) += asrc_sine.o
113115

114116
OBJS-$(CONFIG_ANULLSINK_FILTER) += asink_anullsink.o
117+
OBJS-$(CONFIG_ANULLSRC_FILTER) += asrc_anullsrc.o
115118

116119
OBJS-$(CONFIG_ASS_FILTER) += vf_subtitles.o
117120
OBJS-$(CONFIG_ALPHAEXTRACT_FILTER) += vf_extractplanes.o
@@ -120,6 +123,8 @@ OBJS-$(CONFIG_ATADENOISE_FILTER) += vf_atadenoise.o
120123
OBJS-$(CONFIG_BBOX_FILTER) += bbox.o vf_bbox.o
121124
OBJS-$(CONFIG_BENCH_FILTER) += f_bench.o
122125
OBJS-$(CONFIG_BLACKDETECT_FILTER) += vf_blackdetect.o
126+
127+
# video filters
123128
OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o
124129
OBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o dualinput.o framesync.o
125130
OBJS-$(CONFIG_BOXBLUR_FILTER) += vf_boxblur.o
@@ -183,8 +188,8 @@ OBJS-$(CONFIG_HISTOGRAM_FILTER) += vf_histogram.o
183188
OBJS-$(CONFIG_HQDN3D_FILTER) += vf_hqdn3d.o
184189
OBJS-$(CONFIG_HQX_FILTER) += vf_hqx.o
185190
OBJS-$(CONFIG_HWDOWNLOAD_FILTER) += vf_hwdownload.o
186-
OBJS-$(CONFIG_HWUPLOAD_FILTER) += vf_hwupload.o
187191
OBJS-$(CONFIG_HWUPLOAD_CUDA_FILTER) += vf_hwupload_cuda.o
192+
OBJS-$(CONFIG_HWUPLOAD_FILTER) += vf_hwupload.o
188193
OBJS-$(CONFIG_HSTACK_FILTER) += vf_stack.o framesync.o
189194
OBJS-$(CONFIG_HUE_FILTER) += vf_hue.o
190195
OBJS-$(CONFIG_IDET_FILTER) += vf_idet.o
@@ -290,6 +295,7 @@ OBJS-$(CONFIG_ZSCALE_FILTER) += vf_zscale.o
290295
OBJS-$(CONFIG_ALLRGB_FILTER) += vsrc_testsrc.o
291296
OBJS-$(CONFIG_ALLYUV_FILTER) += vsrc_testsrc.o
292297
OBJS-$(CONFIG_CELLAUTO_FILTER) += vsrc_cellauto.o
298+
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
293299
OBJS-$(CONFIG_COLOR_FILTER) += vsrc_testsrc.o
294300
OBJS-$(CONFIG_COREIMAGESRC_FILTER) += vf_coreimage.o
295301
OBJS-$(CONFIG_FREI0R_SRC_FILTER) += vf_frei0r.o
@@ -304,8 +310,6 @@ OBJS-$(CONFIG_SMPTEHDBARS_FILTER) += vsrc_testsrc.o
304310
OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o
305311
OBJS-$(CONFIG_TESTSRC2_FILTER) += vsrc_testsrc.o
306312

307-
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
308-
309313
# multimedia filters
310314
OBJS-$(CONFIG_ADRAWGRAPH_FILTER) += f_drawgraph.o
311315
OBJS-$(CONFIG_AHISTOGRAM_FILTER) += avf_ahistogram.o
@@ -331,7 +335,6 @@ SLIBOBJS-$(HAVE_GNU_WINDRES) += avfilterres.o
331335
SKIPHEADERS-$(CONFIG_LIBVIDSTAB) += vidstabutils.h
332336
SKIPHEADERS-$(CONFIG_OPENCL) += opencl_internal.h deshake_opencl_kernel.h unsharp_opencl_kernel.h
333337

334-
OBJS-$(HAVE_THREADS) += pthread.o
335338
OBJS-$(CONFIG_SHARED) += log2_tab.o
336339

337340
TOOLS = graph2dot

0 commit comments

Comments
 (0)