diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-25 11:32:26 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-25 11:32:26 +0200 |
| commit | 63ac806ccb751bc5aadf70b7fc50a603968c4338 (patch) | |
| tree | fa798410a81712628fae66b74abcfc39daf9cb88 | |
| parent | 7bf52e12d4a1ef445d802037795f704fcfdeb4c3 (diff) | |
| parent | 85ce9636e42dbda06b7d0af76a528a64b113fb3a (diff) | |
| download | ffmpeg-63ac806ccb751bc5aadf70b7fc50a603968c4338.tar.gz | |
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>
| -rwxr-xr-x | configure | 50 |
1 files changed, 23 insertions, 27 deletions
@@ -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" |