Commit fe71fde2 authored by Timothy Gu's avatar Timothy Gu

configure: Maintain alphabetical order of components

This is not "pure" alphabetical order since some components are
intentionally kept together.
parent 3b9f41a9
...@@ -1907,9 +1907,9 @@ TOOLCHAIN_FEATURES=" ...@@ -1907,9 +1907,9 @@ TOOLCHAIN_FEATURES="
gnu_as gnu_as
gnu_windres gnu_windres
ibm_asm ibm_asm
inline_asm_direct_symbol_refs
inline_asm_labels inline_asm_labels
inline_asm_nonlocal_labels inline_asm_nonlocal_labels
inline_asm_direct_symbol_refs
pragma_deprecated pragma_deprecated
rsync_contimeout rsync_contimeout
symver_asm_label symver_asm_label
...@@ -1955,9 +1955,8 @@ HAVE_LIST=" ...@@ -1955,9 +1955,8 @@ HAVE_LIST="
$TYPES_LIST $TYPES_LIST
atomics_native atomics_native
dos_paths dos_paths
dxva2api_cobj
dxva2_lib dxva2_lib
winrt dxva2api_cobj
libc_msvcrt libc_msvcrt
libdc1394_1 libdc1394_1
libdc1394_2 libdc1394_2
...@@ -1971,6 +1970,7 @@ HAVE_LIST=" ...@@ -1971,6 +1970,7 @@ HAVE_LIST="
threads threads
vaapi_x11 vaapi_x11
vdpau_x11 vdpau_x11
winrt
xlib xlib
" "
...@@ -2010,8 +2010,8 @@ CONFIG_EXTRA=" ...@@ -2010,8 +2010,8 @@ CONFIG_EXTRA="
intrax8 intrax8
ividsp ividsp
jpegtables jpegtables
libx262
lgplv3 lgplv3
libx262
llauddsp llauddsp
llviddsp llviddsp
lpc lpc
...@@ -2226,7 +2226,6 @@ faanidct_deps="faan idctdsp" ...@@ -2226,7 +2226,6 @@ faanidct_deps="faan idctdsp"
frame_thread_encoder_deps="encoders threads" frame_thread_encoder_deps="encoders threads"
intrax8_select="error_resilience" intrax8_select="error_resilience"
mdct_select="fft" mdct_select="fft"
rdft_select="fft"
me_cmp_select="fdctdsp idctdsp pixblockdsp" me_cmp_select="fdctdsp idctdsp pixblockdsp"
mpeg_er_select="error_resilience" mpeg_er_select="error_resilience"
mpegaudio_select="mpegaudiodsp" mpegaudio_select="mpegaudiodsp"
...@@ -2235,6 +2234,7 @@ mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp mpeg_er videodsp" ...@@ -2235,6 +2234,7 @@ mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp mpeg_er videodsp"
mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp" mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
qsvdec_select="qsv" qsvdec_select="qsv"
qsvenc_select="qsv" qsvenc_select="qsv"
rdft_select="fft"
# decoders / encoders # decoders / encoders
aac_decoder_select="imdct15 mdct sinewin" aac_decoder_select="imdct15 mdct sinewin"
...@@ -2296,10 +2296,10 @@ ffvhuff_encoder_select="huffyuv_encoder" ...@@ -2296,10 +2296,10 @@ ffvhuff_encoder_select="huffyuv_encoder"
fic_decoder_select="golomb" fic_decoder_select="golomb"
flac_decoder_select="flacdsp golomb" flac_decoder_select="flacdsp golomb"
flac_encoder_select="bswapdsp flacdsp golomb lpc" flac_encoder_select="bswapdsp flacdsp golomb lpc"
flashsv2_decoder_select="zlib"
flashsv2_encoder_select="zlib"
flashsv_decoder_select="zlib" flashsv_decoder_select="zlib"
flashsv_encoder_select="zlib" flashsv_encoder_select="zlib"
flashsv2_encoder_select="zlib"
flashsv2_decoder_select="zlib"
flv_decoder_select="h263_decoder" flv_decoder_select="h263_decoder"
flv_encoder_select="h263_encoder" flv_encoder_select="h263_encoder"
fourxm_decoder_select="blockdsp bswapdsp" fourxm_decoder_select="blockdsp bswapdsp"
...@@ -2323,9 +2323,9 @@ hap_decoder_select="snappy texturedsp" ...@@ -2323,9 +2323,9 @@ hap_decoder_select="snappy texturedsp"
hap_encoder_deps="libsnappy" hap_encoder_deps="libsnappy"
hap_encoder_select="texturedspenc" hap_encoder_select="texturedspenc"
hevc_decoder_select="bswapdsp cabac golomb videodsp" hevc_decoder_select="bswapdsp cabac golomb videodsp"
hevc_qsv_encoder_deps="libmfx"
hevc_qsv_decoder_deps="libmfx" hevc_qsv_decoder_deps="libmfx"
hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel" hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel"
hevc_qsv_encoder_deps="libmfx"
hevc_qsv_encoder_select="qsvenc" hevc_qsv_encoder_select="qsvenc"
huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp" huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp"
huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp" huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp"
...@@ -2395,8 +2395,8 @@ prores_decoder_select="blockdsp idctdsp" ...@@ -2395,8 +2395,8 @@ prores_decoder_select="blockdsp idctdsp"
prores_encoder_select="fdctdsp" prores_encoder_select="fdctdsp"
qcelp_decoder_select="lsp" qcelp_decoder_select="lsp"
qdm2_decoder_select="mdct rdft mpegaudiodsp" qdm2_decoder_select="mdct rdft mpegaudiodsp"
ra_144_encoder_select="audio_frame_queue lpc audiodsp"
ra_144_decoder_select="audiodsp" ra_144_decoder_select="audiodsp"
ra_144_encoder_select="audio_frame_queue lpc audiodsp"
ralf_decoder_select="golomb" ralf_decoder_select="golomb"
rawvideo_decoder_select="bswapdsp" rawvideo_decoder_select="bswapdsp"
rscc_decoder_select="zlib" rscc_decoder_select="zlib"
...@@ -2436,9 +2436,9 @@ utvideo_decoder_select="bswapdsp" ...@@ -2436,9 +2436,9 @@ utvideo_decoder_select="bswapdsp"
utvideo_encoder_select="bswapdsp huffman huffyuvencdsp" utvideo_encoder_select="bswapdsp huffman huffyuvencdsp"
vble_decoder_select="huffyuvdsp" vble_decoder_select="huffyuvdsp"
vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 qpeldsp startcode" vc1_decoder_select="blockdsp h263_decoder h264qpel intrax8 qpeldsp startcode"
vc1image_decoder_select="vc1_decoder"
vc1_qsv_decoder_deps="libmfx" vc1_qsv_decoder_deps="libmfx"
vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel" vc1_qsv_decoder_select="qsvdec vc1_qsv_hwaccel"
vc1image_decoder_select="vc1_decoder"
vorbis_decoder_select="mdct" vorbis_decoder_select="mdct"
vorbis_encoder_select="mdct" vorbis_encoder_select="mdct"
vp3_decoder_select="hpeldsp vp3dsp videodsp" vp3_decoder_select="hpeldsp vp3dsp videodsp"
...@@ -2493,9 +2493,9 @@ h264_d3d11va_hwaccel_select="h264_decoder" ...@@ -2493,9 +2493,9 @@ h264_d3d11va_hwaccel_select="h264_decoder"
h264_dxva2_hwaccel_deps="dxva2" h264_dxva2_hwaccel_deps="dxva2"
h264_dxva2_hwaccel_select="h264_decoder" h264_dxva2_hwaccel_select="h264_decoder"
h264_mmal_decoder_deps="mmal" h264_mmal_decoder_deps="mmal"
h264_mmal_hwaccel_deps="mmal"
h264_mmal_decoder_select="h264_decoder" h264_mmal_decoder_select="h264_decoder"
h264_mmal_encoder_deps="mmal" h264_mmal_encoder_deps="mmal"
h264_mmal_hwaccel_deps="mmal"
h264_qsv_hwaccel_deps="libmfx" h264_qsv_hwaccel_deps="libmfx"
h264_vaapi_hwaccel_deps="vaapi" h264_vaapi_hwaccel_deps="vaapi"
h264_vaapi_hwaccel_select="h264_decoder" h264_vaapi_hwaccel_select="h264_decoder"
...@@ -2538,8 +2538,8 @@ mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder" ...@@ -2538,8 +2538,8 @@ mpeg2_d3d11va_hwaccel_select="mpeg2video_decoder"
mpeg2_dxva2_hwaccel_deps="dxva2" mpeg2_dxva2_hwaccel_deps="dxva2"
mpeg2_dxva2_hwaccel_select="mpeg2video_decoder" mpeg2_dxva2_hwaccel_select="mpeg2video_decoder"
mpeg2_mmal_decoder_deps="mmal" mpeg2_mmal_decoder_deps="mmal"
mpeg2_mmal_hwaccel_deps="mmal"
mpeg2_mmal_decoder_select="mpeg2video_decoder" mpeg2_mmal_decoder_select="mpeg2video_decoder"
mpeg2_mmal_hwaccel_deps="mmal"
mpeg2_qsv_hwaccel_deps="libmfx" mpeg2_qsv_hwaccel_deps="libmfx"
mpeg2_qsv_hwaccel_select="qsvdec_mpeg2" mpeg2_qsv_hwaccel_select="qsvdec_mpeg2"
mpeg2_vaapi_hwaccel_deps="vaapi" mpeg2_vaapi_hwaccel_deps="vaapi"
...@@ -2565,17 +2565,17 @@ vc1_d3d11va_hwaccel_deps="d3d11va" ...@@ -2565,17 +2565,17 @@ vc1_d3d11va_hwaccel_deps="d3d11va"
vc1_d3d11va_hwaccel_select="vc1_decoder" vc1_d3d11va_hwaccel_select="vc1_decoder"
vc1_dxva2_hwaccel_deps="dxva2" vc1_dxva2_hwaccel_deps="dxva2"
vc1_dxva2_hwaccel_select="vc1_decoder" vc1_dxva2_hwaccel_select="vc1_decoder"
vc1_mmal_decoder_deps="mmal"
vc1_mmal_decoder_select="vc1_decoder"
vc1_mmal_hwaccel_deps="mmal"
vc1_qsv_hwaccel_deps="libmfx"
vc1_qsv_hwaccel_select="qsvdec_vc1"
vc1_vaapi_hwaccel_deps="vaapi" vc1_vaapi_hwaccel_deps="vaapi"
vc1_vaapi_hwaccel_select="vc1_decoder" vc1_vaapi_hwaccel_select="vc1_decoder"
vc1_vdpau_decoder_deps="vdpau" vc1_vdpau_decoder_deps="vdpau"
vc1_vdpau_decoder_select="vc1_decoder" vc1_vdpau_decoder_select="vc1_decoder"
vc1_vdpau_hwaccel_deps="vdpau" vc1_vdpau_hwaccel_deps="vdpau"
vc1_vdpau_hwaccel_select="vc1_decoder" vc1_vdpau_hwaccel_select="vc1_decoder"
vc1_mmal_decoder_deps="mmal"
vc1_mmal_hwaccel_deps="mmal"
vc1_mmal_decoder_select="vc1_decoder"
vc1_qsv_hwaccel_deps="libmfx"
vc1_qsv_hwaccel_select="qsvdec_vc1"
vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9" vp9_d3d11va_hwaccel_deps="d3d11va DXVA_PicParams_VP9"
vp9_d3d11va_hwaccel_select="vp9_decoder" vp9_d3d11va_hwaccel_select="vp9_decoder"
vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9" vp9_dxva2_hwaccel_deps="dxva2 DXVA_PicParams_VP9"
...@@ -2639,6 +2639,8 @@ libspeex_encoder_deps="libspeex" ...@@ -2639,6 +2639,8 @@ libspeex_encoder_deps="libspeex"
libspeex_encoder_select="audio_frame_queue" libspeex_encoder_select="audio_frame_queue"
libtheora_encoder_deps="libtheora" libtheora_encoder_deps="libtheora"
libtwolame_encoder_deps="libtwolame" libtwolame_encoder_deps="libtwolame"
libutvideo_decoder_deps="libutvideo"
libutvideo_encoder_deps="libutvideo"
libvo_aacenc_encoder_deps="libvo_aacenc" libvo_aacenc_encoder_deps="libvo_aacenc"
libvo_aacenc_encoder_select="audio_frame_queue" libvo_aacenc_encoder_select="audio_frame_queue"
libvo_amrwbenc_encoder_deps="libvo_amrwbenc" libvo_amrwbenc_encoder_deps="libvo_amrwbenc"
...@@ -2659,8 +2661,6 @@ libx264rgb_encoder_select="libx264_encoder" ...@@ -2659,8 +2661,6 @@ libx264rgb_encoder_select="libx264_encoder"
libx265_encoder_deps="libx265" libx265_encoder_deps="libx265"
libxavs_encoder_deps="libxavs" libxavs_encoder_deps="libxavs"
libxvid_encoder_deps="libxvid" libxvid_encoder_deps="libxvid"
libutvideo_decoder_deps="libutvideo"
libutvideo_encoder_deps="libutvideo"
libzvbi_teletext_decoder_deps="libzvbi" libzvbi_teletext_decoder_deps="libzvbi"
nvenc_encoder_deps="nvenc" nvenc_encoder_deps="nvenc"
nvenc_h264_encoder_deps="nvenc" nvenc_h264_encoder_deps="nvenc"
...@@ -2747,10 +2747,10 @@ avfoundation_indev_extralibs="-framework CoreVideo -framework Foundation -framew ...@@ -2747,10 +2747,10 @@ avfoundation_indev_extralibs="-framework CoreVideo -framework Foundation -framew
avfoundation_indev_select="avfoundation" avfoundation_indev_select="avfoundation"
bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h" bktr_indev_deps_any="dev_bktr_ioctl_bt848_h machine_ioctl_bt848_h dev_video_bktr_ioctl_bt848_h dev_ic_bt8xx_h"
caca_outdev_deps="libcaca" caca_outdev_deps="libcaca"
decklink_outdev_deps="decklink pthreads"
decklink_outdev_extralibs="-lstdc++"
decklink_indev_deps="decklink pthreads" decklink_indev_deps="decklink pthreads"
decklink_indev_extralibs="-lstdc++" decklink_indev_extralibs="-lstdc++"
decklink_outdev_deps="decklink pthreads"
decklink_outdev_extralibs="-lstdc++"
dshow_indev_deps="IBaseFilter" dshow_indev_deps="IBaseFilter"
dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi" dshow_indev_extralibs="-lpsapi -lole32 -lstrmiids -luuid -loleaut32 -lshlwapi"
dv1394_indev_deps="dv1394" dv1394_indev_deps="dv1394"
...@@ -2782,10 +2782,10 @@ v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h" ...@@ -2782,10 +2782,10 @@ v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h" v4l2_outdev_deps_any="linux_videodev2_h sys_videoio_h"
vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines" vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
vfwcap_indev_extralibs="-lavicap32" vfwcap_indev_extralibs="-lavicap32"
xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute"
xv_outdev_extralibs="-lXv -lX11 -lXext"
x11grab_indev_deps="x11grab" x11grab_indev_deps="x11grab"
x11grab_xcb_indev_deps="libxcb" x11grab_xcb_indev_deps="libxcb"
xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute"
xv_outdev_extralibs="-lXv -lX11 -lXext"
# protocols # protocols
async_protocol_deps="threads" async_protocol_deps="threads"
...@@ -2860,8 +2860,8 @@ ebur128_filter_deps="gpl" ...@@ -2860,8 +2860,8 @@ ebur128_filter_deps="gpl"
eq_filter_deps="gpl" eq_filter_deps="gpl"
fftfilt_filter_deps="avcodec" fftfilt_filter_deps="avcodec"
fftfilt_filter_select="rdft" fftfilt_filter_select="rdft"
flite_filter_deps="libflite"
find_rect_filter_deps="avcodec avformat gpl" find_rect_filter_deps="avcodec avformat gpl"
flite_filter_deps="libflite"
frei0r_filter_deps="frei0r dlopen" frei0r_filter_deps="frei0r dlopen"
frei0r_src_filter_deps="frei0r dlopen" frei0r_src_filter_deps="frei0r dlopen"
fspp_filter_deps="gpl" fspp_filter_deps="gpl"
...@@ -2877,13 +2877,13 @@ mpdecimate_filter_deps="gpl" ...@@ -2877,13 +2877,13 @@ mpdecimate_filter_deps="gpl"
mpdecimate_filter_select="pixelutils" mpdecimate_filter_select="pixelutils"
mptestsrc_filter_deps="gpl" mptestsrc_filter_deps="gpl"
negate_filter_deps="lut_filter" negate_filter_deps="lut_filter"
perspective_filter_deps="gpl"
pp7_filter_deps="gpl"
ocr_filter_deps="libtesseract" ocr_filter_deps="libtesseract"
ocv_filter_deps="libopencv" ocv_filter_deps="libopencv"
owdenoise_filter_deps="gpl" owdenoise_filter_deps="gpl"
pan_filter_deps="swresample" pan_filter_deps="swresample"
perspective_filter_deps="gpl"
phase_filter_deps="gpl" phase_filter_deps="gpl"
pp7_filter_deps="gpl"
pp_filter_deps="gpl postproc" pp_filter_deps="gpl postproc"
pullup_filter_deps="gpl" pullup_filter_deps="gpl"
removelogo_filter_deps="avcodec avformat swscale" removelogo_filter_deps="avcodec avformat swscale"
...@@ -2891,10 +2891,9 @@ repeatfields_filter_deps="gpl" ...@@ -2891,10 +2891,9 @@ repeatfields_filter_deps="gpl"
resample_filter_deps="avresample" resample_filter_deps="avresample"
rubberband_filter_deps="librubberband" rubberband_filter_deps="librubberband"
sab_filter_deps="gpl swscale" sab_filter_deps="gpl swscale"
scale_filter_deps="swscale"
scale2ref_filter_deps="swscale" scale2ref_filter_deps="swscale"
scale_filter_deps="swscale"
select_filter_select="pixelutils" select_filter_select="pixelutils"
smartblur_filter_deps="gpl swscale"
showcqt_filter_deps="avcodec avformat swscale" showcqt_filter_deps="avcodec avformat swscale"
showcqt_filter_select="fft" showcqt_filter_select="fft"
showfreqs_filter_deps="avcodec" showfreqs_filter_deps="avcodec"
...@@ -2903,6 +2902,7 @@ showspectrum_filter_deps="avcodec" ...@@ -2903,6 +2902,7 @@ showspectrum_filter_deps="avcodec"
showspectrum_filter_select="fft" showspectrum_filter_select="fft"
showspectrumpic_filter_deps="avcodec" showspectrumpic_filter_deps="avcodec"
showspectrumpic_filter_select="fft" showspectrumpic_filter_select="fft"
smartblur_filter_deps="gpl swscale"
sofalizer_filter_deps="netcdf avcodec" sofalizer_filter_deps="netcdf avcodec"
sofalizer_filter_select="fft" sofalizer_filter_select="fft"
spectrumsynth_filter_deps="avcodec" spectrumsynth_filter_deps="avcodec"
...@@ -2912,21 +2912,21 @@ spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp" ...@@ -2912,21 +2912,21 @@ spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp"
stereo3d_filter_deps="gpl" stereo3d_filter_deps="gpl"
subtitles_filter_deps="avformat avcodec libass" subtitles_filter_deps="avformat avcodec libass"
super2xsai_filter_deps="gpl" super2xsai_filter_deps="gpl"
tinterlace_filter_deps="gpl"
vidstabdetect_filter_deps="libvidstab"
vidstabtransform_filter_deps="libvidstab"
pixfmts_super2xsai_test_deps="super2xsai_filter" pixfmts_super2xsai_test_deps="super2xsai_filter"
tinterlace_filter_deps="gpl"
tinterlace_merge_test_deps="tinterlace_filter" tinterlace_merge_test_deps="tinterlace_filter"
tinterlace_pad_test_deps="tinterlace_filter" tinterlace_pad_test_deps="tinterlace_filter"
uspp_filter_deps="gpl avcodec" uspp_filter_deps="gpl avcodec"
vidstabdetect_filter_deps="libvidstab"
vidstabtransform_filter_deps="libvidstab"
zmq_filter_deps="libzmq" zmq_filter_deps="libzmq"
zoompan_filter_deps="swscale" zoompan_filter_deps="swscale"
zscale_filter_deps="libzimg" zscale_filter_deps="libzimg"
# examples # examples
avio_reading="avformat avcodec avutil"
avio_dir_cmd="avformat avutil"
avcodec_example_deps="avcodec avutil" avcodec_example_deps="avcodec avutil"
avio_dir_cmd="avformat avutil"
avio_reading="avformat avcodec avutil"
decoding_encoding_example_deps="avcodec avformat avutil" decoding_encoding_example_deps="avcodec avformat avutil"
demuxing_decoding_example_deps="avcodec avformat avutil" demuxing_decoding_example_deps="avcodec avformat avutil"
extract_mvs_example_deps="avcodec avformat avutil" extract_mvs_example_deps="avcodec avformat avutil"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment