X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=69c0d015dd9c59907734c595b4936bd534d71af3;hb=3f9371680990e1eb8d9b76dde4d5fea82e4cd2ab;hp=34aa134b790673e3e3bba68cad370403bff5573c;hpb=abfc8d056ea99fe69b656dd21f7fdc1e32eaa41f;p=ffmpeg

diff --git a/configure b/configure
index 34aa134b790..69c0d015dd9 100755
--- a/configure
+++ b/configure
@@ -1050,6 +1050,7 @@ inline_asm_deps="!tms470"
 
 # decoders / encoders / hardware accelerators
 aac_decoder_select="fft mdct"
+aac_encoder_select="fft mdct"
 ac3_decoder_select="fft mdct"
 atrac3_decoder_select="fft mdct"
 cavs_decoder_select="golomb"
@@ -1059,6 +1060,7 @@ dca_decoder_select="fft mdct"
 dnxhd_encoder_select="aandct"
 dxa_decoder_select="zlib"
 eac3_decoder_select="ac3_decoder"
+eamad_decoder_select="aandct"
 eatgq_decoder_select="aandct"
 eatqi_decoder_select="aandct"
 ffv1_decoder_select="golomb"
@@ -1095,6 +1097,7 @@ mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder"
 mpeg4_vaapi_hwaccel_deps="va_va_h"
 mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder"
 mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h"
+mpeg_xvmc_decoder_select="mpegvideo_decoder"
 msmpeg4v1_encoder_select="aandct"
 msmpeg4v2_encoder_select="aandct"
 msmpeg4v3_encoder_select="aandct"
@@ -1214,6 +1217,7 @@ x11_grab_device_indev_extralibs="-lX11 -lXext"
 # protocols
 gopher_protocol_deps="network"
 http_protocol_deps="network"
+rtmp_protocol_deps="tcp_protocol"
 rtp_protocol_deps="udp_protocol"
 tcp_protocol_deps="network"
 udp_protocol_deps="network"
@@ -1685,6 +1689,7 @@ case "$arch" in
         arch="alpha"
         enable fast_64bit
         check_cflags -mieee
+        pic=$shared
     ;;
     arm|armv[4567]*l)
         arch="arm"
@@ -1697,24 +1702,29 @@ case "$arch" in
     ia64)
         arch="ia64"
         enable fast_64bit
+        pic=$shared
     ;;
     m68k)
         arch="m68k"
     ;;
     mips|mipsel|IP*)
         arch="mips"
+        pic=$shared
     ;;
     mips64)
         arch="mips"
         subarch="mips64"
         enable fast_64bit
+        pic=$shared
     ;;
     parisc|hppa)
         arch="parisc"
+        pic=$shared
     ;;
     parisc64|hppa64)
         arch="parisc"
         enable fast_64bit
+        pic=$shared
     ;;
     "Power Macintosh"|ppc|powerpc)
         arch="ppc"
@@ -1734,11 +1744,13 @@ case "$arch" in
     ;;
     sparc)
         arch="sparc"
+        pic=$shared
     ;;
     sun4u|sparc64)
         arch="sparc"
         subarch="sparc64"
         enable fast_64bit
+        pic=$shared
     ;;
     i386|i486|i586|i686|i86pc|BePC)
         arch="x86"
@@ -1751,7 +1763,7 @@ case "$arch" in
         enable cmov
         enable fast_cmov
         enable fast_unaligned
-        check_cc <<EOF && enable fast_64bit && subarch="x86_64"
+        check_cc <<EOF && enable fast_64bit && subarch="x86_64" && pic=$shared
         int test[sizeof(char*) - 7];
 EOF
     ;;
@@ -1803,7 +1815,7 @@ case $target_os in
         ;;
     openbsd)
         enable malloc_aligned
-        LIBOBJFLAGS='$(PIC)'
+        enable pic
         SHFLAGS='-shared'
         oss_indev_extralibs="-lossaudio"
         oss_outdev_extralibs="-lossaudio"
@@ -1829,7 +1841,11 @@ case $target_os in
         enabled shared || check_cflags -mdynamic-no-pic
         ;;
     mingw32*)
-        target_os=mingw32
+        if test $target_os = "mingw32ce"; then
+            disable network
+        else
+            target_os=mingw32
+        fi
         LIBTARGET=i386
         if enabled x86_64; then
             enable malloc_aligned
@@ -2369,15 +2385,7 @@ elif enabled gcc; then
     check_cflags -fno-tree-vectorize
 fi
 
-# PIC flags for shared library objects where they are needed
-if enabled shared; then
-    # LIBOBJFLAGS may have already been set in the OS configuration
-    if test -z "$LIBOBJFLAGS" ; then
-        case "${subarch-$arch}" in
-            x86_64|ia64|alpha|sparc*|power*|parisc*|mips*) LIBOBJFLAGS='$(PIC)' ;;
-        esac
-    fi
-fi
+enabled pic && LIBOBJFLAGS='$(PIC)'
 
 if enabled gprof; then
     add_cflags  -p
@@ -2569,7 +2577,7 @@ echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak
 echo "YASMFLAGS=$YASMFLAGS" >> config.mak
 echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
-echo "BUILD_STATIC=$static" >> config.mak
+echo "PIC=-fPIC -DPIC" >> config.mak
 echo "BUILDSUF=$build_suffix" >> config.mak
 echo "FULLNAME=$FULLNAME" >> config.mak
 echo "LIBPREF=$LIBPREF" >> config.mak
@@ -2589,11 +2597,6 @@ echo "HOSTLIBS=$host_libs" >> config.mak
 echo "TARGET_EXEC=$target_exec" >> config.mak
 echo "TARGET_PATH=$target_path" >> config.mak
 
-if enabled bigendian; then
-    echo "WORDS_BIGENDIAN=yes" >> config.mak
-    echo "#define WORDS_BIGENDIAN 1" >> $TMPH
-fi
-
 if enabled sdl; then
     echo "SDL_LIBS=$("${SDL_CONFIG}" --libs)" >> config.mak
     echo "SDL_CFLAGS=$("${SDL_CONFIG}" --cflags)" >> config.mak
@@ -2621,8 +2624,6 @@ get_version LIBAVUTIL   libavutil/avutil.h
 get_version LIBAVFILTER libavfilter/avfilter.h
 
 if enabled shared; then
-    echo "BUILD_SHARED=yes" >> config.mak
-    echo "PIC=-fPIC -DPIC" >> config.mak
     echo "LIBTARGET=${LIBTARGET}" >> config.mak
     echo "SLIBNAME=${SLIBNAME}" >> config.mak
     echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
@@ -2655,7 +2656,7 @@ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST       \
 
 echo "#define restrict $_restrict" >> $TMPH
 
-if enabled small; then
+if enabled small || disabled optimizations; then
     echo "#define av_always_inline"  >> $TMPH
 fi