RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Anton Khirnov 2016-05-03 08:06:15 +02:00
parent c0f4c7db9f
commit 85ce9636e4
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
configure vendored
View File

@ -1219,6 +1219,20 @@ EXAMPLE_LIST="
transcode_aac_example transcode_aac_example
" "
HWACCEL_LIBRARY_LIST="
cuda
d3d11va
dxva2
libmfx
libnpp
mmal
nvenc
omx
vaapi
vda
vdpau
"
EXTERNAL_LIBRARY_LIST=" EXTERNAL_LIBRARY_LIST="
avisynth avisynth
bzlib bzlib
@ -1236,7 +1250,6 @@ EXTERNAL_LIBRARY_LIST="
libilbc libilbc
libkvazaar libkvazaar
libmp3lame libmp3lame
libnpp
libopencore_amrnb libopencore_amrnb
libopencore_amrwb libopencore_amrwb
libopencv libopencv
@ -1281,22 +1294,6 @@ FEATURE_LIST="
swscale_alpha swscale_alpha
" "
HW_CODECS_LIST="
cuda
libmfx
mmal
nvenc
omx
"
HWACCEL_LIST="
d3d11va
dxva2
vaapi
vda
vdpau
"
LIBRARY_LIST=" LIBRARY_LIST="
avcodec avcodec
avdevice avdevice
@ -1336,9 +1333,8 @@ CONFIG_LIST="
$COMPONENT_LIST $COMPONENT_LIST
$EXAMPLE_LIST $EXAMPLE_LIST
$EXTERNAL_LIBRARY_LIST $EXTERNAL_LIBRARY_LIST
$HWACCEL_LIBRARY_LIST
$FEATURE_LIST $FEATURE_LIST
$HW_CODECS_LIST
$HWACCEL_LIST
$LICENSE_LIST $LICENSE_LIST
$LIBRARY_LIST $LIBRARY_LIST
$PROGRAM_LIST $PROGRAM_LIST
@ -5113,6 +5109,9 @@ echo
echo "External libraries:" echo "External libraries:"
print_enabled '' $EXTERNAL_LIBRARY_LIST | print_3_columns print_enabled '' $EXTERNAL_LIBRARY_LIST | print_3_columns
echo echo
echo "External libraries providing hardware acceleration:"
print_enabled '' $HWACCEL_LIBRARY_LIST | print_3_columns
echo
echo "Libraries:" echo "Libraries:"
print_enabled '' $LIBRARY_LIST | print_3_columns 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 echo
done done
echo "Enabled Hardware-accelerated codecs:"
print_enabled '' $HW_CODECS_LIST | print_3_columns
echo
license="LGPL version 2.1 or later" license="LGPL version 2.1 or later"
if enabled nonfree; then if enabled nonfree; then
license="nonfree and unredistributable" license="nonfree and unredistributable"