ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768'

Browse Source 
* commit '3fc09b0081184f26edbb62d2d72ae89bf9e21768':
  configure: Move list of external libs to a separate variable

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-02-24 17:55:31 +01:00
commit 214cb30b72
1 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
configure vendored
View File

@ -1115,61 +1115,13 @@ COMPONENT_LIST="
protocols
"
DOCUMENT_LIST="
doc
htmlpages
manpages
podpages
txtpages
"
HWACCEL_LIST="
dxva2
vaapi
vda
vdpau
"
LIBRARY_LIST="
avcodec
avdevice
avfilter
avformat
avresample
avutil
postproc
swresample
swscale
"
PROGRAM_LIST="
ffplay
ffprobe
ffserver
ffmpeg
"
CONFIG_LIST="
$COMPONENT_LIST
$DOCUMENT_LIST
$HWACCEL_LIST
$LIBRARY_LIST
$PROGRAM_LIST
EXTERNAL_LIBRARY_LIST="
avisynth
bzlib
crystalhd
dct
dwt
fast_unaligned
fft
fontconfig
frei0r
ftrapv
gnutls
gpl
gray
hardcoded_tables
incompatible_fork_abi
libaacplus
libass
libbluray
@ -1209,6 +1161,62 @@ CONFIG_LIST="
libx264
libxavs
libxvid
openal
openssl
x11grab
zlib
"
DOCUMENT_LIST="
doc
htmlpages
manpages
podpages
txtpages
"
HWACCEL_LIST="
dxva2
vaapi
vda
vdpau
"
LIBRARY_LIST="
avcodec
avdevice
avfilter
avformat
avresample
avutil
postproc
swresample
swscale
"
PROGRAM_LIST="
ffplay
ffprobe
ffserver
ffmpeg
"
CONFIG_LIST="
$COMPONENT_LIST
$DOCUMENT_LIST
$EXTERNAL_LIBRARY_LIST
$HWACCEL_LIST
$LIBRARY_LIST
$PROGRAM_LIST
dct
dwt
fast_unaligned
fft
ftrapv
gpl
gray
hardcoded_tables
incompatible_fork_abi
lsp
lzo
mdct
@ -1216,8 +1224,6 @@ CONFIG_LIST="
memory_poisoning
network
nonfree
openal
openssl
pic
rdft
runtime_cpudetect
@ -1230,8 +1236,6 @@ CONFIG_LIST="
thumb
version3
xmm_clobber_test
x11grab
zlib
"
THREADS_LIST='