generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a'

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

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2016-06-25 11:32:26 +02:00
commit 63ac806ccb
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
configure vendored
View File

@ -1466,7 +1466,6 @@ EXAMPLE_LIST="
" "
EXTERNAL_LIBRARY_LIST=" EXTERNAL_LIBRARY_LIST="
audiotoolbox
avisynth avisynth
bzlib bzlib
chromaprint chromaprint
@ -1501,7 +1500,6 @@ EXTERNAL_LIBRARY_LIST="
libmodplug libmodplug
libmp3lame libmp3lame
libnut libnut
libnpp
libopencore_amrnb libopencore_amrnb
libopencore_amrwb libopencore_amrwb
libopencv libopencv
@ -1555,6 +1553,24 @@ EXTERNAL_LIBRARY_LIST="
zlib zlib
" "
HWACCEL_LIBRARY_LIST="
audiotoolbox
cuda
cuvid
d3d11va
dxva2
libmfx
libnpp
mmal
nvenc
omx
vaapi
vda
vdpau
videotoolbox_hwaccel
xvmc
"
DOCUMENT_LIST=" DOCUMENT_LIST="
doc doc
htmlpages htmlpages
@ -1576,25 +1592,6 @@ FEATURE_LIST="
swscale_alpha swscale_alpha
" "
HW_CODECS_LIST="
cuda
cuvid
libmfx
mmal
nvenc
omx
"
HWACCEL_LIST="
d3d11va
dxva2
vaapi
vda
vdpau
videotoolbox_hwaccel
xvmc
"
LIBRARY_LIST=" LIBRARY_LIST="
avcodec avcodec
avdevice avdevice
@ -1640,9 +1637,8 @@ CONFIG_LIST="
$DOCUMENT_LIST $DOCUMENT_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
@ -6433,6 +6429,10 @@ echo "External libraries:"
print_enabled '' $EXTERNAL_LIBRARY_LIST | print_in_columns print_enabled '' $EXTERNAL_LIBRARY_LIST | print_in_columns
echo echo
echo "External libraries providing hardware acceleration:"
print_enabled '' $HWACCEL_LIBRARY_LIST | print_in_columns
echo
echo "Libraries:" echo "Libraries:"
print_enabled '' $LIBRARY_LIST | print_in_columns print_enabled '' $LIBRARY_LIST | print_in_columns
echo echo
@ -6444,10 +6444,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_in_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"