---
configure | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/configure b/configure
index 567fa9d..461a624 100755
--- a/configure
+++ b/configure
@@ -1059,8 +1059,8 @@ HAVE_LIST="
dev_bktr_ioctl_bt848_h
dev_bktr_ioctl_meteor_h
dev_ic_bt8xx_h
- dev_video_meteor_ioctl_meteor_h
dev_video_bktr_ioctl_bt848_h
+ dev_video_meteor_ioctl_meteor_h
dlfcn_h
dlopen
dos_paths
@@ -1079,7 +1079,6 @@ HAVE_LIST="
GetProcessTimes
getrusage
gnu_as
- struct_rusage_ru_maxrss
ibm_asm
inet_aton
inline_asm
@@ -1105,28 +1104,29 @@ HAVE_LIST="
memalign
mkstemp
mmap
+ poll_h
posix_memalign
round
roundf
sdl
sdl_video_size
setmode
+ setrlimit
sndio_h
socklen_t
soundcard_h
- poll_h
- setrlimit
strerror_r
strptime
strtok_r
struct_addrinfo
struct_ipv6_mreq
+ struct_rusage_ru_maxrss
struct_sockaddr_in6
struct_sockaddr_sa_len
struct_sockaddr_storage
symver
- symver_gnu_asm
symver_asm_label
+ symver_gnu_asm
sys_mman_h
sys_resource_h
sys_select_h
@@ -1241,8 +1241,8 @@ fast_64bit_if_any="alpha ia64 mips64 parisc64 ppc64
sparc64 x86_64"
fast_clz_if_any="alpha armv5te avr32 mips ppc x86"
fast_unaligned_if_any="armv6 ppc x86"
-need_memalign="altivec neon sse"
inline_asm_deps="!tms470"
+need_memalign="altivec neon sse"
symver_if_any="symver_asm_label symver_gnu_asm"
@@ -1306,28 +1306,28 @@ loco_decoder_select="golomb"
mjpeg_encoder_select="aandct"
mlp_decoder_select="mlp_parser"
mp1_decoder_select="mpegaudiodsp"
-mp2_decoder_select="mpegaudiodsp"
-mp3adu_decoder_select="mpegaudiodsp"
-mp3_decoder_select="mpegaudiodsp"
-mp3on4_decoder_select="mpegaudiodsp"
mp1float_decoder_select="mpegaudiodsp"
+mp2_decoder_select="mpegaudiodsp"
mp2float_decoder_select="mpegaudiodsp"
+mp3_decoder_select="mpegaudiodsp"
+mp3adu_decoder_select="mpegaudiodsp"
mp3adufloat_decoder_select="mpegaudiodsp"
mp3float_decoder_select="mpegaudiodsp"
+mp3on4_decoder_select="mpegaudiodsp"
mp3on4float_decoder_select="mpegaudiodsp"
-mpeg1video_encoder_select="aandct"
-mpeg2video_encoder_select="aandct"
-mpeg4_decoder_select="h263_decoder mpeg4video_parser"
-mpeg4_encoder_select="h263_encoder"
mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder"
+mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
+mpeg_xvmc_decoder_select="mpegvideo_decoder"
mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder"
+mpeg1video_encoder_select="aandct"
mpeg2_dxva2_hwaccel_deps="dxva2api_h"
mpeg2_dxva2_hwaccel_select="dxva2 mpeg2video_decoder"
mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder"
+mpeg2video_encoder_select="aandct"
+mpeg4_decoder_select="h263_decoder mpeg4video_parser"
+mpeg4_encoder_select="h263_encoder"
mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder"
mpeg4_vdpau_decoder_select="vdpau mpeg4_decoder"
-mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
-mpeg_xvmc_decoder_select="mpegvideo_decoder"
msmpeg4v1_decoder_select="h263_decoder"
msmpeg4v1_encoder_select="h263_encoder"
msmpeg4v2_decoder_select="h263_decoder"
@@ -1513,8 +1513,6 @@ avformat_deps="avcodec"
postproc_deps="gpl"
# programs
-ffmpeg_deps="avcodec avformat swscale"
-ffmpeg_select="buffer_filter"
avconv_deps="avcodec avformat swscale"
avconv_select="buffer_filter"
avplay_deps="avcodec avformat swscale sdl"
@@ -1522,6 +1520,8 @@ avplay_select="rdft"
avprobe_deps="avcodec avformat"
avserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
avserver_extralibs='$ldl'
+ffmpeg_deps="avcodec avformat swscale"
+ffmpeg_select="buffer_filter"
doc_deps="texi2html"
@@ -1572,8 +1572,8 @@ test_deps _encoder _decoder
\
mpeg2video="mpeg2thread mpeg2thread_ilace" \
mpeg4="mpeg4 mpeg4_adap mpeg4_qpel mpeg4_qprd mpeg4adv mpeg4nr" \
mpeg4="mpeg4thread error rc" \
- msmpeg4v3=msmpeg4 \
msmpeg4v2 \
+ msmpeg4v3=msmpeg4 \
pbm=pbmpipe \
pcx \
pgm="pgm pgmpipe" \
@@ -1595,7 +1595,6 @@ test_deps _encoder _decoder
\
test_deps _muxer _demuxer \
aiff \
- pcm_alaw=alaw \
asf \
au \
avi \
@@ -1606,14 +1605,15 @@ test_deps _muxer _demuxer
\
matroska=mkv \
mmf \
mov \
- pcm_mulaw=mulaw \
+ mpegts=ts \
mxf="mxf mxf_d10" \
nut \
ogg \
+ pcm_alaw=alaw \
+ pcm_mulaw=mulaw \
rawvideo=pixfmt \
rm \
swf \
- mpegts=ts \
voc \
wav \
yuv4mpegpipe=yuv4mpeg \
@@ -1641,11 +1641,11 @@ cc_version=\"unknown\"
host_cc_default="gcc"
ln_s="ln -sf"
nm_default="nm"
+nogas=":"
objformat="elf"
pkg_config_default=pkg-config
ranlib="ranlib"
yasmexe="yasm"
-nogas=":"
nm_opts='-g'
@@ -1658,12 +1658,12 @@ target_os_default=$(tolower $(uname -s))
host_os=$target_os_default
# configurable options
+enable asm
enable avcodec
enable avdevice
enable avfilter
enable avformat
enable avutil
-enable asm
enable debug
enable doc
enable fastdiv
@@ -1897,14 +1897,14 @@ tmpfile(){
trap 'rm -f -- $TMPFILES' EXIT
+tmpfile TMPASM .asm
tmpfile TMPC .c
tmpfile TMPE $EXESUF
tmpfile TMPH .h
tmpfile TMPO .o
tmpfile TMPS .S
-tmpfile TMPV .ver
tmpfile TMPSH .sh
-tmpfile TMPASM .asm
+tmpfile TMPV .ver
unset -f mktemp
@@ -1923,9 +1923,9 @@ EOF
die "Sanity test failed."
fi
+filter_asflags=echo
filter_cflags=echo
filter_cppflags=echo
-filter_asflags=echo
if $cc -v 2>&1 | grep -q '^gcc.*LLVM'; then
cc_type=llvm_gcc
@@ -3336,13 +3336,13 @@ get_version(){
eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
}
-get_version LIBSWSCALE libswscale/swscale.h
-get_version LIBPOSTPROC libpostproc/postprocess.h
get_version LIBAVCODEC libavcodec/version.h
get_version LIBAVDEVICE libavdevice/avdevice.h
+get_version LIBAVFILTER libavfilter/avfilter.h
get_version LIBAVFORMAT libavformat/version.h
get_version LIBAVUTIL libavutil/avutil.h
-get_version LIBAVFILTER libavfilter/avfilter.h
+get_version LIBPOSTPROC libpostproc/postprocess.h
+get_version LIBSWSCALE libswscale/swscale.h
cat > $TMPH <<EOF
/* Automatically generated by configure - do not modify! */
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
