diff options
author | Anton Khirnov <anton@khirnov.net> | 2016-05-03 08:06:15 +0200 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2016-05-19 13:43:29 +0200 |
commit | 85ce9636e42dbda06b7d0af76a528a64b113fb3a (patch) | |
tree | c46ae7a695a9390d72a47a6d1a9f37ab1734e8c5 /configure | |
parent | c0f4c7db9fea1c07d290a298b8db858b7ceed96d (diff) | |
download | ffmpeg-85ce9636e42dbda06b7d0af76a528a64b113fb3a.tar.gz |
configure: move the hardware accel libs' entries in the configure output
Print them as a subsection of the external library section, in line with
what is done for the help text in the previous commit.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 41 |
1 files changed, 18 insertions, 23 deletions
@@ -1219,6 +1219,20 @@ EXAMPLE_LIST=" transcode_aac_example " +HWACCEL_LIBRARY_LIST=" + cuda + d3d11va + dxva2 + libmfx + libnpp + mmal + nvenc + omx + vaapi + vda + vdpau +" + EXTERNAL_LIBRARY_LIST=" avisynth bzlib @@ -1236,7 +1250,6 @@ EXTERNAL_LIBRARY_LIST=" libilbc libkvazaar libmp3lame - libnpp libopencore_amrnb libopencore_amrwb libopencv @@ -1281,22 +1294,6 @@ FEATURE_LIST=" swscale_alpha " -HW_CODECS_LIST=" - cuda - libmfx - mmal - nvenc - omx -" - -HWACCEL_LIST=" - d3d11va - dxva2 - vaapi - vda - vdpau -" - LIBRARY_LIST=" avcodec avdevice @@ -1336,9 +1333,8 @@ CONFIG_LIST=" $COMPONENT_LIST $EXAMPLE_LIST $EXTERNAL_LIBRARY_LIST + $HWACCEL_LIBRARY_LIST $FEATURE_LIST - $HW_CODECS_LIST - $HWACCEL_LIST $LICENSE_LIST $LIBRARY_LIST $PROGRAM_LIST @@ -5113,6 +5109,9 @@ echo echo "External libraries:" print_enabled '' $EXTERNAL_LIBRARY_LIST | print_3_columns echo +echo "External libraries providing hardware acceleration:" +print_enabled '' $HWACCEL_LIBRARY_LIST | print_3_columns +echo echo "Libraries:" print_enabled '' $LIBRARY_LIST | print_3_columns @@ -5125,10 +5124,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_3_columns -echo - license="LGPL version 2.1 or later" if enabled nonfree; then license="nonfree and unredistributable" |