[FFmpeg-cvslog] Merge commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Jun 25 11:32:26 2016 +0200| [63ac806ccb751bc5aadf70b7fc50a603968c4338] | committer: Clément Bœsch

Merge commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63ac806ccb751bc5aadf70b7fc50a603968c4338
---

 configure |   50 +++++++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 27 deletions(-)

diff --git a/configure b/configure
index 51828b7..2c9d00a 100755
--- a/configure
+++ b/configure
@@ -1466,7 +1466,6 @@ EXAMPLE_LIST="
 "
 
 EXTERNAL_LIBRARY_LIST="
-    audiotoolbox
     avisynth
     bzlib
     chromaprint
@@ -1501,7 +1500,6 @@ EXTERNAL_LIBRARY_LIST="
     libmodplug
     libmp3lame
     libnut
-    libnpp
     libopencore_amrnb
     libopencore_amrwb
     libopencv
@@ -1555,6 +1553,24 @@ EXTERNAL_LIBRARY_LIST="
     zlib
 "
 
+HWACCEL_LIBRARY_LIST="
+    audiotoolbox
+    cuda
+    cuvid
+    d3d11va
+    dxva2
+    libmfx
+    libnpp
+    mmal
+    nvenc
+    omx
+    vaapi
+    vda
+    vdpau
+    videotoolbox_hwaccel
+    xvmc
+"
+
 DOCUMENT_LIST="
     doc
     htmlpages
@@ -1576,25 +1592,6 @@ FEATURE_LIST="
     swscale_alpha
 "
 
-HW_CODECS_LIST="
-    cuda
-    cuvid
-    libmfx
-    mmal
-    nvenc
-    omx
-"
-
-HWACCEL_LIST="
-    d3d11va
-    dxva2
-    vaapi
-    vda
-    vdpau
-    videotoolbox_hwaccel
-    xvmc
-"
-
 LIBRARY_LIST="
     avcodec
     avdevice
@@ -1640,9 +1637,8 @@ CONFIG_LIST="
     $DOCUMENT_LIST
     $EXAMPLE_LIST
     $EXTERNAL_LIBRARY_LIST
+    $HWACCEL_LIBRARY_LIST
     $FEATURE_LIST
-    $HW_CODECS_LIST
-    $HWACCEL_LIST
     $LICENSE_LIST
     $LIBRARY_LIST
     $PROGRAM_LIST
@@ -6433,6 +6429,10 @@ echo "External libraries:"
 print_enabled '' $EXTERNAL_LIBRARY_LIST | print_in_columns
 echo
 
+echo "External libraries providing hardware acceleration:"
+print_enabled '' $HWACCEL_LIBRARY_LIST | print_in_columns
+echo
+
 echo "Libraries:"
 print_enabled '' $LIBRARY_LIST | print_in_columns
 echo
@@ -6444,10 +6444,6 @@ for type in decoder encoder hwaccel parser demuxer muxer protocol filter bsf ind
     echo
 done
 
-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"


======================================================================

diff --cc configure
index 51828b7,664bfff..2c9d00a
--- a/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
 +    libnut
-     libnpp
      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
 +
+ echo "External libraries providing hardware acceleration:"
 -print_enabled '' $HWACCEL_LIBRARY_LIST | print_3_columns
++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