Merge commit '330177b508420a553083df94f22cbd5142de0f4a'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 11 May 2016 14:11:46 +0000 (15:11 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 11 May 2016 14:19:06 +0000 (15:19 +0100)
* commit '330177b508420a553083df94f22cbd5142de0f4a':
  build: Group declarations for hw-accelerated de-/encoding separately

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
configure
libavcodec/Makefile

diff --cc configure
+++ b/configure
@@@ -147,15 -131,20 +147,21 @@@ Component options
    --disable-rdft           disable RDFT code
    --disable-fft            disable FFT code
    --disable-faan           disable floating point AAN (I)DCT code
 +  --disable-pixelutils     disable pixel utils in libavutil
  
  Hardware accelerators:
 -  --enable-d3d11va         enable D3D11VA code
 -  --enable-dxva2           enable DXVA2 code
 -  --enable-vaapi           enable VAAPI code
 -  --enable-vda             enable VDA code
 -  --enable-vdpau           enable VDPAU code
 +  --disable-d3d11va        disable D3D11VA code [autodetect]
 +  --disable-dxva2          disable DXVA2 code [autodetect]
 +  --disable-vaapi          disable VAAPI code [autodetect]
 +  --disable-vda            disable VDA code [autodetect]
 +  --disable-vdpau          disable VDPAU code [autodetect]
  
 -  --enable-nvenc           enable encoding via NVENC [no]
+ Hardware-accelerated decoding/encoding:
+   --enable-cuda            enable dynamically linked CUDA [no]
+   --enable-libmfx          enable HW acceleration through libmfx
+   --enable-mmal            enable decoding via MMAL [no]
++  --enable-nvenc           enable NVIDIA NVENC support [no]
  Individual component options:
    --disable-everything     disable all components listed below
    --disable-encoder=NAME   disable encoder NAME
    --disable-filters        disable all filters
  
  External library support:
 +  --disable-audiotoolbox   enable AudioToolbox decoders and encoders [autodetect]
    --enable-avisynth        enable reading of AviSynth script files [no]
 -  --enable-bzlib           enable bzlib [autodetect]
 -  --enable-frei0r          enable frei0r video filtering
 -  --enable-gnutls          enable gnutls [no]
 +  --disable-bzlib          disable bzlib [autodetect]
-   --enable-cuda            enable dynamically linked CUDA [no]
 +  --enable-chromaprint     enable audio fingerprinting with chromaprint [no]
 +  --enable-fontconfig      enable fontconfig, useful for drawtext filter [no]
 +  --enable-frei0r          enable frei0r video filtering [no]
 +  --enable-gcrypt          enable gcrypt, needed for rtmp(t)e support
 +                           if openssl, librtmp or gmp is not used [no]
 +  --enable-gmp             enable gmp, needed for rtmp(t)e support
 +                           if openssl or librtmp is not used [no]
 +  --enable-gnutls          enable gnutls, needed for https support
 +                           if openssl is not used [no]
 +  --disable-iconv          disable iconv [autodetect]
 +  --enable-jni             enable JNI support [no]
 +  --enable-ladspa          enable LADSPA audio filtering [no]
 +  --enable-libass          enable libass subtitles rendering,
 +                           needed for subtitles and ass filter [no]
 +  --enable-libbluray       enable BluRay reading using libbluray [no]
    --enable-libbs2b         enable bs2b DSP library [no]
 -  --enable-libcdio         enable audio CD grabbing with libcdio
 +  --enable-libcaca         enable textual display using libcaca [no]
 +  --enable-libcelt         enable CELT decoding via libcelt [no]
 +  --enable-libcdio         enable audio CD grabbing with libcdio [no]
    --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
                             and libraw1394 [no]
 -  --enable-libdcadec       enable DCA decoding via libdcadec [no]
    --enable-libfaac         enable AAC encoding via libfaac [no]
    --enable-libfdk-aac      enable AAC de/encoding via libfdk-aac [no]
 -  --enable-libfreetype     enable libfreetype [no]
 +  --enable-libflite        enable flite (voice synthesis) support via libflite [no]
 +  --enable-libfreetype     enable libfreetype, needed for drawtext filter [no]
 +  --enable-libfribidi      enable libfribidi, improves drawtext filter [no]
 +  --enable-libgme          enable Game Music Emu via libgme [no]
    --enable-libgsm          enable GSM de/encoding via libgsm [no]
 +  --enable-libiec61883     enable iec61883 via libiec61883 [no]
    --enable-libilbc         enable iLBC de/encoding via libilbc [no]
    --enable-libkvazaar      enable HEVC encoding via libkvazaar [no]
-   --enable-libmfx          enable HW acceleration through libmfx
 +  --enable-libmodplug      enable ModPlug via libmodplug [no]
    --enable-libmp3lame      enable MP3 encoding via libmp3lame [no]
 +  --enable-libnut          enable NUT (de)muxing via libnut,
 +                           native (de)muxer exists [no]
    --enable-libnpp          enable NVIDIA Performance Primitives-based code [no]
    --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no]
    --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]
    --enable-libx264         enable H.264 encoding via x264 [no]
    --enable-libx265         enable HEVC encoding via x265 [no]
    --enable-libxavs         enable AVS encoding via xavs [no]
 -  --enable-libxcb          enable X11 grabbing using XCB [no]
 -  --enable-libxcb-shm      enable X11 grabbing shm communication [auto]
 -  --enable-libxcb-xfixes   enable X11 grabbing mouse rendering [auto]
 +  --enable-libxcb          enable X11 grabbing using XCB [autodetect]
 +  --enable-libxcb-shm      enable X11 grabbing shm communication [autodetect]
 +  --enable-libxcb-xfixes   enable X11 grabbing mouse rendering [autodetect]
 +  --enable-libxcb-shape    enable X11 grabbing shape rendering [autodetect]
    --enable-libxvid         enable Xvid encoding via xvidcore,
                             native MPEG-4/Xvid encoder exists [no]
 -  --enable-openssl         enable openssl [no]
 +  --enable-libzimg         enable z.lib, needed for zscale filter [no]
 +  --enable-libzmq          enable message passing via libzmq [no]
 +  --enable-libzvbi         enable teletext support via libzvbi [no]
 +  --disable-lzma           disable lzma [autodetect]
 +  --enable-decklink        enable Blackmagic DeckLink I/O support [no]
 +  --enable-mediacodec      enable Android MediaCodec support [no]
-   --enable-mmal            enable decoding via MMAL [no]
 +  --enable-netcdf          enable NetCDF, needed for sofalizer filter [no]
-   --enable-nvenc           enable NVIDIA NVENC support [no]
 +  --enable-openal          enable OpenAL 1.1 capture support [no]
 +  --enable-opencl          enable OpenCL code
 +  --enable-opengl          enable OpenGL rendering [no]
 +  --enable-openssl         enable openssl, needed for https support
 +                           if gnutls is not used [no]
 +  --disable-schannel       disable SChannel SSP, needed for TLS support on
 +                           Windows if openssl and gnutls are not used [autodetect]
 +  --disable-sdl            disable sdl [autodetect]
 +  --disable-securetransport disable Secure Transport, needed for TLS support
 +                           on OSX if openssl and gnutls are not used [autodetect]
 +  --disable-videotoolbox   disable VideoToolbox code [autodetect]
    --enable-x11grab         enable X11 grabbing (legacy) [no]
 -  --enable-zlib            enable zlib [autodetect]
 +  --disable-xlib           disable xlib [autodetect]
 +  --disable-zlib           disable zlib [autodetect]
  
  Toolchain options:
    --arch=ARCH              select architecture [$arch]
@@@ -1448,42 -1207,22 +1450,40 @@@ EXAMPLE_LIST=
  "
  
  EXTERNAL_LIBRARY_LIST="
 +    audiotoolbox
      avisynth
      bzlib
-     cuda
 +    chromaprint
 +    crystalhd
 +    decklink
      frei0r
 +    gcrypt
 +    gmp
      gnutls
 +    iconv
 +    jni
 +    ladspa
 +    libass
 +    libbluray
      libbs2b
 +    libcaca
      libcdio
 +    libcelt
      libdc1394
 -    libdcadec
      libfaac
      libfdk_aac
 +    libflite
      libfontconfig
      libfreetype
 +    libfribidi
 +    libgme
      libgsm
 +    libiec61883
      libilbc
      libkvazaar
-     libmfx
 +    libmodplug
      libmp3lame
 +    libnut
      libnpp
      libopencore_amrnb
      libopencore_amrwb
      libxavs
      libxcb
      libxcb_shm
 +    libxcb_shape
      libxcb_xfixes
      libxvid
-     mmal
 +    libzimg
 +    libzmq
 +    libzvbi
 +    lzma
 +    mediacodec
-     nvenc
 +    netcdf
 +    openal
 +    opencl
 +    opengl
      openssl
 +    schannel
 +    sdl
 +    securetransport
 +    videotoolbox
      x11grab
 +    xlib
      zlib
  "
  
@@@ -2272,13 -1880,9 +2278,10 @@@ me_cmp_select="fdctdsp idctdsp pixblock
  mpeg_er_select="error_resilience"
  mpegaudio_select="mpegaudiodsp"
  mpegaudiodsp_select="dct"
 -mpegvideo_select="blockdsp hpeldsp idctdsp me_cmp mpeg_er videodsp"
 +mpegvideo_select="blockdsp h264chroma hpeldsp idctdsp me_cmp mpeg_er videodsp"
  mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"
- qsvdec_select="qsv"
- qsvenc_select="qsv"
- vaapi_encode_deps="vaapi"
  vc1dsp_select="h264chroma qpeldsp startcode"
 +rdft_select="fft"
  
  # decoders / encoders
  aac_decoder_select="imdct15 mdct sinewin"
@@@ -2369,14 -1958,8 +2366,8 @@@ hap_decoder_select="snappy texturedsp
  hap_encoder_deps="libsnappy"
  hap_encoder_select="texturedspenc"
  hevc_decoder_select="bswapdsp cabac golomb videodsp"
- hevc_qsv_decoder_deps="libmfx"
- hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel"
- hevc_qsv_encoder_deps="libmfx"
- hevc_qsv_encoder_select="qsvenc"
 -huffyuv_decoder_select="bswapdsp huffyuvdsp"
 -huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp"
 +huffyuv_decoder_select="bswapdsp huffyuvdsp llviddsp"
 +huffyuv_encoder_select="bswapdsp huffman huffyuvencdsp llviddsp"
- hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC"
- hevc_vaapi_encoder_select="vaapi_encode golomb"
  iac_decoder_select="imc_decoder"
  imc_decoder_select="bswapdsp fft mdct sinewin"
  indeo3_decoder_select="hpeldsp"
@@@ -2413,15 -1996,10 +2404,11 @@@ mpc7_decoder_select="bswapdsp mpegaudio
  mpc8_decoder_select="mpegaudiodsp"
  mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
  mpeg_xvmc_decoder_select="mpeg2video_decoder"
 -mpeg1video_decoder_select="error_resilience mpeg_er mpegvideo"
 -mpeg1video_encoder_select="aandcttables mpegvideoenc"
 -mpeg2video_decoder_select="error_resilience mpeg_er mpegvideo"
 -mpeg2video_encoder_select="aandcttables mpegvideoenc"
 +mpegvideo_decoder_select="mpegvideo"
 +mpeg1video_decoder_select="mpegvideo"
 +mpeg1video_encoder_select="aandcttables mpegvideoenc h263dsp"
 +mpeg2video_decoder_select="mpegvideo"
 +mpeg2video_encoder_select="aandcttables mpegvideoenc h263dsp"
- mpeg2_qsv_decoder_deps="libmfx"
- mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel"
- mpeg2_qsv_encoder_deps="libmfx"
- mpeg2_qsv_encoder_select="qsvenc"
  mpeg4_decoder_select="h263_decoder mpeg4video_parser"
  mpeg4_encoder_select="h263_encoder"
  msa1_decoder_select="mss34dsp"
@@@ -2646,9 -2148,41 +2633,38 @@@ wmv3_crystalhd_decoder_select="crystalh
  wmv3_d3d11va_hwaccel_select="vc1_d3d11va_hwaccel"
  wmv3_dxva2_hwaccel_select="vc1_dxva2_hwaccel"
  wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel"
 +wmv3_vdpau_decoder_select="vc1_vdpau_decoder"
  wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel"
  
 -nvenc_deps_any="dlopen LoadLibrary"
 -nvenc_extralibs='$ldl'
+ # hardware-accelerated codecs
 -h264_nvenc_encoder_deps="nvenc"
+ qsvdec_select="qsv"
+ qsvenc_select="qsv"
+ vaapi_encode_deps="vaapi"
+ hwupload_cuda_filter_deps="cuda"
+ scale_npp_filter_deps="cuda libnpp"
 -hevc_nvenc_encoder_deps="nvenc"
++nvenc_encoder_deps="nvenc"
+ h264_qsv_decoder_deps="libmfx"
+ h264_qsv_decoder_select="h264_mp4toannexb_bsf h264_parser qsvdec h264_qsv_hwaccel"
+ h264_qsv_encoder_deps="libmfx"
+ h264_qsv_encoder_select="qsvenc"
+ h264_vaapi_encoder_deps="VAEncPictureParameterBufferH264"
+ h264_vaapi_encoder_select="vaapi_encode golomb"
 -hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser hevc_qsv_hwaccel qsvdec"
+ hevc_qsv_decoder_deps="libmfx"
++hevc_qsv_decoder_select="hevc_mp4toannexb_bsf hevc_parser qsvdec hevc_qsv_hwaccel"
+ hevc_qsv_encoder_deps="libmfx"
 -mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel mpegvideo_parser"
+ hevc_qsv_encoder_select="qsvenc"
+ hevc_vaapi_encoder_deps="VAEncPictureParameterBufferHEVC"
+ hevc_vaapi_encoder_select="vaapi_encode golomb"
+ mpeg2_qsv_decoder_deps="libmfx"
 -
++mpeg2_qsv_decoder_select="qsvdec mpeg2_qsv_hwaccel"
+ mpeg2_qsv_encoder_deps="libmfx"
+ mpeg2_qsv_encoder_select="qsvenc"
+ nvenc_h264_encoder_deps="nvenc"
+ nvenc_hevc_encoder_deps="nvenc"
  # parsers
  h264_parser_select="h264_decoder"
  hevc_parser_select="golomb"
@@@ -2745,15 -2242,6 +2761,12 @@@ libx264rgb_encoder_select="libx264_enco
  libx265_encoder_deps="libx265"
  libxavs_encoder_deps="libxavs"
  libxvid_encoder_deps="libxvid"
- nvenc_encoder_deps="nvenc"
- nvenc_h264_encoder_deps="nvenc"
- nvenc_hevc_encoder_deps="nvenc"
 +libzvbi_teletext_decoder_deps="libzvbi"
 +videotoolbox_deps="VideoToolbox_VideoToolbox_h"
 +videotoolbox_extralibs="-framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo"
 +videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames"
 +videotoolbox_encoder_suggest="vda_framework vt_bt2020"
 +vt_bt2020_deps="kCVImageBufferColorPrimaries_ITU_R_2020"
  
  # demuxers / muxers
  ac3_demuxer_select="ac3_parser"
@@@ -2942,84 -2375,18 +2955,82 @@@ azmq_filter_deps="libzmq
  blackframe_filter_deps="gpl"
  boxblur_filter_deps="gpl"
  bs2b_filter_deps="libbs2b"
 +colormatrix_filter_deps="gpl"
 +cover_rect_filter_deps="avcodec avformat gpl"
  cropdetect_filter_deps="gpl"
  delogo_filter_deps="gpl"
 +deshake_filter_select="pixelutils"
  drawtext_filter_deps="libfreetype"
 +ebur128_filter_deps="gpl"
 +eq_filter_deps="gpl"
 +fftfilt_filter_deps="avcodec"
 +fftfilt_filter_select="rdft"
 +find_rect_filter_deps="avcodec avformat gpl"
 +firequalizer_filter_deps="avcodec"
 +firequalizer_filter_select="rdft"
 +flite_filter_deps="libflite"
 +framerate_filter_select="pixelutils"
  frei0r_filter_deps="frei0r dlopen"
 -frei0r_filter_extralibs='$ldl'
  frei0r_src_filter_deps="frei0r dlopen"
 -frei0r_src_filter_extralibs='$ldl'
 +fspp_filter_deps="gpl"
 +geq_filter_deps="gpl"
 +histeq_filter_deps="gpl"
  hqdn3d_filter_deps="gpl"
- hwupload_cuda_filter_deps="cuda"
  interlace_filter_deps="gpl"
 +kerndeint_filter_deps="gpl"
 +ladspa_filter_deps="ladspa dlopen"
 +mcdeint_filter_deps="avcodec gpl"
 +movie_filter_deps="avcodec avformat"
 +mpdecimate_filter_deps="gpl"
 +mpdecimate_filter_select="pixelutils"
 +mptestsrc_filter_deps="gpl"
 +negate_filter_deps="lut_filter"
 +nnedi_filter_deps="gpl"
 +ocr_filter_deps="libtesseract"
  ocv_filter_deps="libopencv"
 +owdenoise_filter_deps="gpl"
 +pan_filter_deps="swresample"
 +perspective_filter_deps="gpl"
 +phase_filter_deps="gpl"
 +pp7_filter_deps="gpl"
 +pp_filter_deps="gpl postproc"
 +pullup_filter_deps="gpl"
 +removelogo_filter_deps="avcodec avformat swscale"
 +repeatfields_filter_deps="gpl"
  resample_filter_deps="avresample"
 +rubberband_filter_deps="librubberband"
 +sab_filter_deps="gpl swscale"
 +scale2ref_filter_deps="swscale"
  scale_filter_deps="swscale"
- scale_npp_filter_deps="cuda libnpp"
 +select_filter_select="pixelutils"
 +showcqt_filter_deps="avcodec avformat swscale"
 +showcqt_filter_select="fft"
 +showfreqs_filter_deps="avcodec"
 +showfreqs_filter_select="fft"
 +showspectrum_filter_deps="avcodec"
 +showspectrum_filter_select="fft"
 +showspectrumpic_filter_deps="avcodec"
 +showspectrumpic_filter_select="fft"
 +smartblur_filter_deps="gpl swscale"
 +sofalizer_filter_deps="netcdf avcodec"
 +sofalizer_filter_select="fft"
 +spectrumsynth_filter_deps="avcodec"
 +spectrumsynth_filter_select="fft"
 +spp_filter_deps="gpl avcodec"
 +spp_filter_select="fft idctdsp fdctdsp me_cmp pixblockdsp"
 +stereo3d_filter_deps="gpl"
 +subtitles_filter_deps="avformat avcodec libass"
 +super2xsai_filter_deps="gpl"
 +pixfmts_super2xsai_test_deps="super2xsai_filter"
 +tinterlace_filter_deps="gpl"
 +tinterlace_merge_test_deps="tinterlace_filter"
 +tinterlace_pad_test_deps="tinterlace_filter"
 +uspp_filter_deps="gpl avcodec"
 +vidstabdetect_filter_deps="libvidstab"
 +vidstabtransform_filter_deps="libvidstab"
 +zmq_filter_deps="libzmq"
 +zoompan_filter_deps="swscale"
 +zscale_filter_deps="libzimg"
  scale_vaapi_filter_deps="vaapi VAProcPipelineParameterBuffer"
  
  # examples
@@@ -6374,6 -5093,10 +6385,10 @@@ for type in decoder encoder hwaccel par
      echo
  done
  
 -print_enabled '' $HW_CODECS_LIST | print_3_columns
+ echo "Enabled Hardware-accelerated codecs:"
++print_enabled '' $HW_CODECS_LIST | print_in_columns
+ echo
  license="LGPL version 2.1 or later"
  if enabled nonfree; then
      license="nonfree and unredistributable"
@@@ -312,12 -251,6 +308,7 @@@ OBJS-$(CONFIG_H264_DECODER)            
                                            h264_refs.o h264_sei.o \
                                            h264_slice.o h264data.o h264_parse.o \
                                            h2645_parse.o
- OBJS-$(CONFIG_H264_MMAL_DECODER)       += mmaldec.o
- OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o
- OBJS-$(CONFIG_H264_QSV_DECODER)        += qsvdec_h2645.o
- OBJS-$(CONFIG_H264_QSV_ENCODER)        += qsvenc_h264.o
- OBJS-$(CONFIG_H264_VAAPI_ENCODER)      += vaapi_encode_h264.o vaapi_encode_h26x.o
 +OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec_h264.o
  OBJS-$(CONFIG_HAP_DECODER)             += hapdec.o hap.o
  OBJS-$(CONFIG_HAP_ENCODER)             += hapenc.o hap.o
  OBJS-$(CONFIG_HEVC_DECODER)            += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
@@@ -389,12 -309,9 +377,9 @@@ OBJS-$(CONFIG_MP3ON4_DECODER)          
  OBJS-$(CONFIG_MP3ON4FLOAT_DECODER)     += mpegaudiodec_float.o mpeg4audio.o
  OBJS-$(CONFIG_MPC7_DECODER)            += mpc7.o mpc.o
  OBJS-$(CONFIG_MPC8_DECODER)            += mpc8.o mpc.o
 -OBJS-$(CONFIG_MPEG_XVMC_DECODER)       += mpegvideo_xvmc.o
 +OBJS-$(CONFIG_MPEGVIDEO_DECODER)       += mpeg12dec.o mpeg12.o mpeg12data.o
  OBJS-$(CONFIG_MPEG1VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
  OBJS-$(CONFIG_MPEG1VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
- OBJS-$(CONFIG_MPEG2_MMAL_DECODER)      += mmaldec.o
- OBJS-$(CONFIG_MPEG2_QSV_DECODER)       += qsvdec_mpeg2.o
- OBJS-$(CONFIG_MPEG2_QSV_ENCODER)       += qsvenc_mpeg2.o
  OBJS-$(CONFIG_MPEG2VIDEO_DECODER)      += mpeg12dec.o mpeg12.o mpeg12data.o
  OBJS-$(CONFIG_MPEG2VIDEO_ENCODER)      += mpeg12enc.o mpeg12.o
  OBJS-$(CONFIG_MPEG4_DECODER)           += xvididct.o
@@@ -769,10 -612,25 +754,28 @@@ OBJS-$(CONFIG_VC1_D3D11VA_HWACCEL
  OBJS-$(CONFIG_VC1_DXVA2_HWACCEL)          += dxva2_vc1.o
  OBJS-$(CONFIG_VC1_VAAPI_HWACCEL)          += vaapi_vc1.o
  OBJS-$(CONFIG_VC1_VDPAU_HWACCEL)          += vdpau_vc1.o
 +OBJS-$(CONFIG_VP9_D3D11VA_HWACCEL)        += dxva2_vp9.o
 +OBJS-$(CONFIG_VP9_DXVA2_HWACCEL)          += dxva2_vp9.o
 +OBJS-$(CONFIG_VP9_VAAPI_HWACCEL)          += vaapi_vp9.o
  
 -OBJS-$(CONFIG_H264_NVENC_ENCODER)         += nvenc_h264.o
+ # hardware-accelerated decoding/encoding
+ OBJS-$(CONFIG_NVENC)                      += nvenc.o
+ OBJS-$(CONFIG_QSV)                        += qsv.o
+ OBJS-$(CONFIG_QSVDEC)                     += qsvdec.o
+ OBJS-$(CONFIG_QSVENC)                     += qsvenc.o
+ OBJS-$(CONFIG_H264_MMAL_DECODER)          += mmaldec.o
 -OBJS-$(CONFIG_HEVC_NVENC_ENCODER)         += nvenc_hevc.o
++OBJS-$(CONFIG_H264_VDA_DECODER)           += vda_h264_dec.o
+ OBJS-$(CONFIG_H264_QSV_DECODER)           += qsvdec_h2645.o
+ OBJS-$(CONFIG_H264_QSV_ENCODER)           += qsvenc_h264.o
+ OBJS-$(CONFIG_H264_VAAPI_ENCODER)         += vaapi_encode_h264.o vaapi_encode_h26x.o
+ OBJS-$(CONFIG_HEVC_QSV_DECODER)           += qsvdec_h2645.o
+ OBJS-$(CONFIG_HEVC_QSV_ENCODER)           += qsvenc_hevc.o hevc_ps_enc.o h2645_parse.o
+ OBJS-$(CONFIG_HEVC_VAAPI_ENCODER)         += vaapi_encode_h265.o vaapi_encode_h26x.o
++OBJS-$(CONFIG_MPEG2_MMAL_DECODER)         += mmaldec.o
+ OBJS-$(CONFIG_MPEG2_QSV_DECODER)          += qsvdec_mpeg2.o
+ OBJS-$(CONFIG_MPEG2_QSV_ENCODER)          += qsvenc_mpeg2.o
  # libavformat dependencies
  OBJS-$(CONFIG_ISO_MEDIA)               += mpeg4audio.o mpegaudiodata.o