Merge commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a'

* commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a':
  configure: move the hardware accel libs' entries in the configure output

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc configure
index 51828b75bad184935ef156d303b5586cb4677c2d,664bfffc5570f4e6fd5120d77830a4cb3ca31260..2c9d00a876a8f3748d5c5f7e4282bdc3fe5a481b
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1466,42 -1234,22 +1466,40 @@@ EXAMPLE_LIST=
  "
  
  EXTERNAL_LIBRARY_LIST="
-     audiotoolbox
      avisynth
      bzlib
 +    chromaprint
 +    crystalhd
 +    decklink
      frei0r
 +    gcrypt
 +    gmp
      gnutls
 +    iconv
 +    jni
 +    ladspa
 +    libass
 +    libbluray
      libbs2b
 +    libcaca
      libcdio
 +    libcelt
      libdc1394
 -    libdcadec
 +    libebur128
      libfaac
      libfdk_aac
 +    libflite
      libfontconfig
      libfreetype
 +    libfribidi
 +    libgme
      libgsm
 +    libiec61883
      libilbc
      libkvazaar
 +    libmodplug
      libmp3lame
-     libnpp
 +    libnut
      libopencore_amrnb
      libopencore_amrwb
      libopencv
@@@ -1555,16 -1281,7 +1553,34 @@@
      zlib
  "
  
++HWACCEL_LIBRARY_LIST="
++    audiotoolbox
++    cuda
++    cuvid
++    d3d11va
++    dxva2
++    libmfx
++    libnpp
++    mmal
++    nvenc
++    omx
++    vaapi
++    vda
++    vdpau
++    videotoolbox_hwaccel
++    xvmc
++"
++
 +DOCUMENT_LIST="
 +    doc
 +    htmlpages
 +    manpages
 +    podpages
 +    txtpages
 +"
 +
  FEATURE_LIST="
 +    ftrapv
      gray
      hardcoded_tables
      omx_rpi
@@@ -1637,12 -1331,10 +1634,11 @@@ SUBSYSTEM_LIST=
  
  CONFIG_LIST="
      $COMPONENT_LIST
 +    $DOCUMENT_LIST
      $EXAMPLE_LIST
      $EXTERNAL_LIBRARY_LIST
+     $HWACCEL_LIBRARY_LIST
      $FEATURE_LIST
-     $HW_CODECS_LIST
-     $HWACCEL_LIST
      $LICENSE_LIST
      $LIBRARY_LIST
      $PROGRAM_LIST
@@@ -6425,16 -5106,15 +6421,20 @@@ test -n "$random_seed" &
      echo "random seed               ${random_seed}"
  echo
  
 +echo "Enabled programs:"
 +print_enabled '' $PROGRAM_LIST | print_in_columns
 +echo
 +
  echo "External libraries:"
 -print_enabled '' $EXTERNAL_LIBRARY_LIST | print_3_columns
 +print_enabled '' $EXTERNAL_LIBRARY_LIST | print_in_columns
  echo
 -print_enabled '' $HWACCEL_LIBRARY_LIST | print_3_columns
 +
+ echo "External libraries providing hardware acceleration:"
++print_enabled '' $HWACCEL_LIBRARY_LIST | print_in_columns
+ echo
+ 
  echo "Libraries:"
 -print_enabled '' $LIBRARY_LIST | print_3_columns
 +print_enabled '' $LIBRARY_LIST | print_in_columns
  echo
  
  for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf indev outdev; do