Implement poll_frame() method. Fix ffmpeg.c bug with

[ffmpeg] / configure

diff --git a/configure b/configure
index 4f2ad7a8aaead5a78e0918eb6bbe1b3379228f9e..cefa343dbd782772806f01c3c10d4e67f76d95b2 100755 (executable)
--- a/configure
+++ b/configure
@@ -56,11 +56,12 @@ show_help(){
   echo
   echo "Standard options:"
   echo "  --help                   print this message"
   echo
   echo "Standard options:"
   echo "  --help                   print this message"

-  echo "  --log[=FILE|yes|no]      log tests and output to FILE [config.err]"
-  echo "  --prefix=PREFIX          install in PREFIX [$PREFIX]"
+  echo "  --logfile=FILE           log tests and output to FILE [config.err]"
+  echo "  --disable-logging        do not log configure debug information"
+  echo "  --prefix=PREFIX          install in PREFIX [$prefix]"

   echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
   echo "  --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]"
   echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
   echo "  --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]"

-  echo "  --incdir=DIR             install includes in DIR [PREFIX/include/ffmpeg]"
+  echo "  --incdir=DIR             install includes in DIR [PREFIX/include]"

   echo "  --mandir=DIR             install man page in DIR [PREFIX/share/man]"
   echo "  --enable-static          build static libraries [default=yes]"
   echo "  --disable-static         do not build static libraries [default=no]"
   echo "  --mandir=DIR             install man page in DIR [PREFIX/share/man]"
   echo "  --enable-static          build static libraries [default=yes]"
   echo "  --disable-static         do not build static libraries [default=no]"


@@ -68,8 +69,12 @@ show_help(){
   echo "  --disable-shared         do not build shared libraries [default=yes]"
   echo "  --enable-gpl             allow use of GPL code, the resulting libav*"
   echo "                           and ffmpeg will be under GPL [default=no]"
   echo "  --disable-shared         do not build shared libraries [default=yes]"
   echo "  --enable-gpl             allow use of GPL code, the resulting libav*"
   echo "                           and ffmpeg will be under GPL [default=no]"

-  echo "  --enable-pp              enable GPLed postprocessing support [default=no]"
-  echo "  --enable-swscaler        software scaler support [default=no]"
+  echo "  --enable-nonfree         allow use of nonfree code, the resulting libav*"
+  echo "                           and ffmpeg will be unredistributable [default=no]"
+  echo "  --enable-postproc        enable GPLed postprocessing support [default=no]"
+  echo "  --enable-swscale         software scaler support [default=no]"
+  echo "  --enable-avfilter        video filter support (replaces vhook) [default=no]"
+  echo "  --enable-avfilter-lavf   video filters dependant on avformat [default=no]"

   echo "  --enable-beosthreads     use BeOS threads [default=no]"
   echo "  --enable-os2threads      use OS/2 threads [default=no]"
   echo "  --enable-pthreads        use pthreads [default=no]"
   echo "  --enable-beosthreads     use BeOS threads [default=no]"
   echo "  --enable-os2threads      use OS/2 threads [default=no]"
   echo "  --enable-pthreads        use pthreads [default=no]"


@@ -77,7 +82,7 @@ show_help(){
   echo "  --enable-x11grab         enable X11 grabbing [default=no]"
   echo
   echo "External library support:"
   echo "  --enable-x11grab         enable X11 grabbing [default=no]"
   echo
   echo "External library support:"

-  echo "  --enable-sunmlib         use Sun medialib [default=no]"
+  echo "  --enable-mlib            use Sun medialib [default=no]"

   echo "  --enable-liba52          enable GPLed liba52 support [default=no]"
   echo "  --enable-liba52bin       open liba52.so.0 at runtime [default=no]"
   echo "  --enable-avisynth        allow reading AVISynth script files [default=no]"
   echo "  --enable-liba52          enable GPLed liba52 support [default=no]"
   echo "  --enable-liba52bin       open liba52.so.0 at runtime [default=no]"
   echo "  --enable-avisynth        allow reading AVISynth script files [default=no]"


@@ -102,8 +107,8 @@ show_help(){
   echo "Advanced options (experts only):"
   echo "  --source-path=PATH       path to source code [$source_path]"
   echo "  --cross-prefix=PREFIX    use PREFIX for compilation tools [$cross_prefix]"
   echo "Advanced options (experts only):"
   echo "  --source-path=PATH       path to source code [$source_path]"
   echo "  --cross-prefix=PREFIX    use PREFIX for compilation tools [$cross_prefix]"

-  echo "  --cross-compile          assume a cross-compiler is used"
-  echo "  --target-os=OS           compiler targets OS [$targetos]"
+  echo "  --enable-cross-compile   assume a cross-compiler is used"
+  echo "  --target-os=OS           compiler targets OS [$target_os]"

   echo "  --cc=CC                  use C compiler CC [$cc]"
   echo "  --make=MAKE              use specified make [$make]"
   echo "  --extra-cflags=ECFLAGS   add ECFLAGS to CFLAGS [$CFLAGS]"
   echo "  --cc=CC                  use C compiler CC [$cc]"
   echo "  --make=MAKE              use specified make [$make]"
   echo "  --extra-cflags=ECFLAGS   add ECFLAGS to CFLAGS [$CFLAGS]"


@@ -116,6 +121,8 @@ show_help(){
   echo "  --enable-powerpc-perf    enable performance report on PPC"
   echo "                           (requires enabling PMC)"
   echo "  --disable-mmx            disable MMX usage"
   echo "  --enable-powerpc-perf    enable performance report on PPC"
   echo "                           (requires enabling PMC)"
   echo "  --disable-mmx            disable MMX usage"

+  echo "  --disable-mmx2           disable MMX2 usage"
+  echo "  --disable-ssse3          disable SSSE3 usage"

   echo "  --disable-armv5te        disable armv5te usage"
   echo "  --disable-armv6          disable armv6 usage"
   echo "  --disable-iwmmxt         disable iwmmxt usage"
   echo "  --disable-armv5te        disable armv5te usage"
   echo "  --disable-armv6          disable armv6 usage"
   echo "  --disable-iwmmxt         disable iwmmxt usage"


@@ -170,7 +177,7 @@ show_help(){
   echo "  --enable-gprof           enable profiling with gprof [$gprof]"
   echo "  --disable-optimizations  disable compiler optimizations"
   echo "  --enable-extra-warnings  enable more compiler warnings"
   echo "  --enable-gprof           enable profiling with gprof [$gprof]"
   echo "  --disable-optimizations  disable compiler optimizations"
   echo "  --enable-extra-warnings  enable more compiler warnings"

-  echo "  --disable-strip          disable stripping of executables and shared libraries"
+  echo "  --disable-stripping      disable stripping of executables and shared libraries"

   echo ""
   echo "NOTE: Object files are built at the place where configure is launched."
   exit 1
   echo ""
   echo "NOTE: Object files are built at the place where configure is launched."
   exit 1


@@ -198,28 +205,28 @@ If you think configure made a mistake, make sure you are using the latest
 version from SVN.  If the latest version fails, report the problem to the
 ffmpeg-user@mplayerhq.hu mailing list or IRC #ffmpeg on irc.freenode.net.
 EOF
 version from SVN.  If the latest version fails, report the problem to the
 ffmpeg-user@mplayerhq.hu mailing list or IRC #ffmpeg on irc.freenode.net.
 EOF

-    if enabled logging; then
+    if disabled logging; then

         cat <<EOF
         cat <<EOF

-Include the log file "$logfile" produced by configure as this will help
-solving the problem.
+Rerun configure with logging enabled (do not use --disable-logging), and
+include the log this produces with your report.

 EOF
     else
 cat <<EOF
 EOF
     else
 cat <<EOF

-Rerun configure with logging enabled (do not use --log=no), and include the
-log this produces with your report.
+Include the log file "$logfile" produced by configure as this will help
+solving the problem.

 EOF
     fi
 EOF
     fi

-    rm -f $TMPC $TMPO $TMPE $TMPS $TMPH
+    rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH

     exit 1
 }
 
     exit 1
 }
 

-# "tr '[a-z]' '[A-Z]'" is a workaround for Solaris tr not grokking "tr a-z A-Z"
+# Avoid locale weirdness, besides we really just want to translate ASCII.

 toupper(){
 toupper(){

-    echo "$@" | tr '[a-z]' '[A-Z]'
+    echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ

 }
 
 tolower(){
 }
 
 tolower(){

-    echo "$@" | tr '[A-Z]' '[a-z]'
+    echo "$@" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz

 }
 
 set_all(){
 }
 
 set_all(){


@@ -420,9 +427,7 @@ check_asm(){
     asm="$2"
     shift 2
     check_cc "$@" <<EOF && enable $name || disable $name
     asm="$2"
     shift 2
     check_cc "$@" <<EOF && enable $name || disable $name

-int foo(void){
-    asm volatile($asm);
-}
+int foo(void){ asm volatile($asm); }

 EOF
 }
 
 EOF
 }
 


@@ -447,9 +452,7 @@ EOF
 check_ldflags(){
     log check_ldflags "$@"
     check_ld "$@" <<EOF && add_ldflags "$@"
 check_ldflags(){
     log check_ldflags "$@"
     check_ld "$@" <<EOF && add_ldflags "$@"

-int main(void){
-    return 0;
-}
+int main(void){ return 0; }

 EOF
 }
 
 EOF
 }
 


@@ -472,9 +475,7 @@ check_func(){
     disable $func
     check_ld "$@" <<EOF && enable $func
 extern int $func();
     disable $func
     check_ld "$@" <<EOF && enable $func
 extern int $func();

-int main(void){
-    $func();
-}
+int main(void){ $func(); }

 EOF
 }
 
 EOF
 }
 


@@ -491,7 +492,7 @@ check_func2(){
     done
     check_ld "$@" <<EOF && enable $func
 $incs
     done
     check_ld "$@" <<EOF && enable $func
 $incs

-int main(void){
+int main(int argc, char **argv){

     (void) $func;
     return 0;
 }
     (void) $func;
     return 0;
 }


@@ -613,6 +614,7 @@ COMPONENT_LIST="
     decoders
     demuxers
     encoders
     decoders
     demuxers
     encoders

+    filters

     indevs
     muxers
     outdevs
     indevs
     muxers
     outdevs


@@ -622,6 +624,8 @@ COMPONENT_LIST="
 
 CONFIG_LIST="
     $COMPONENT_LIST
 
 CONFIG_LIST="
     $COMPONENT_LIST

+    avfilter
+    avfilter_lavf

     avisynth
     beos_netserver
     ffmpeg
     avisynth
     beos_netserver
     ffmpeg


@@ -634,7 +638,6 @@ CONFIG_LIST="
     ipv6
     liba52
     liba52bin
     ipv6
     liba52
     liba52bin

-    libamr

     libamr_nb
     libamr_wb
     libdc1394
     libamr_nb
     libamr_wb
     libdc1394


@@ -649,12 +652,14 @@ CONFIG_LIST="
     libx264
     libxvid
     memalign_hack
     libx264
     libxvid
     memalign_hack

+    mlib

     mpegaudio_hp
     network
     mpegaudio_hp
     network

+    nonfree
+    postproc

     powerpc_perf
     powerpc_perf

-    pp

     small
     small

-    swscaler
+    swscale

     vhook
     x11grab
     zlib
     vhook
     x11grab
     zlib


@@ -692,6 +697,7 @@ ARCH_EXT_LIST='
     iwmmxt
     mmi
     mmx
     iwmmxt
     mmi
     mmx

+    mmx2

     ssse3
     vis
 '
     ssse3
     vis
 '


@@ -701,6 +707,7 @@ HAVE_LIST="
     $THREADS_LIST
     altivec_h
     arpa_inet_h
     $THREADS_LIST
     altivec_h
     arpa_inet_h

+    bswap

     byteswap_h
     closesocket
     cmov
     byteswap_h
     closesocket
     cmov


@@ -725,6 +732,7 @@ HAVE_LIST="
     getrusage
     imlib2
     inet_aton
     getrusage
     imlib2
     inet_aton

+    inline_asm

     libdc1394_1
     libdc1394_2
     llrint
     libdc1394_1
     libdc1394_2
     llrint


@@ -735,7 +743,7 @@ HAVE_LIST="
     malloc_h
     memalign
     mkstemp
     malloc_h
     memalign
     mkstemp

-    mlib
+    pld

     ppc64
     round
     roundf
     ppc64
     round
     roundf


@@ -743,7 +751,8 @@ HAVE_LIST="
     sdl_video_size
     socklen_t
     soundcard_h
     sdl_video_size
     socklen_t
     soundcard_h

-    sys_poll_h
+    poll_h
+    sys_mman_h

     sys_select_h
     sys_soundcard_h
     termios_h
     sys_select_h
     sys_soundcard_h
     termios_h


@@ -755,12 +764,31 @@ CMDLINE_SELECT="
     $ARCH_EXT_LIST
     $CONFIG_LIST
     $THREADS_LIST
     $ARCH_EXT_LIST
     $CONFIG_LIST
     $THREADS_LIST

+    cross_compile

     debug
     extra_warnings
     debug
     extra_warnings

+    logging

     optimizations
     shared
     static
     optimizations
     shared
     static

+    stripping

 "
 "

+CMDLINE_SET='
+    arch
+    build_suffix
+    cc
+    cpu
+    cross_prefix
+    incdir
+    libdir
+    logfile
+    make
+    mandir
+    prefix
+    shlibdir
+    source_path
+    target_os
+'

 
 # code dependency declarations
 
 
 # code dependency declarations
 


@@ -771,6 +799,7 @@ armv6_deps="armv4l"
 iwmmxt_deps="armv4l"
 mmi_deps="mips"
 mmx_deps="x86"
 iwmmxt_deps="armv4l"
 mmi_deps="mips"
 mmx_deps="x86"

+mmx2_deps="x86 mmx"

 ssse3_deps="x86"
 vis_deps="sparc"
 
 ssse3_deps="x86"
 vis_deps="sparc"
 


@@ -779,22 +808,9 @@ ac3_decoder_deps="gpl"
 dxa_decoder_deps="zlib"
 flashsv_decoder_deps="zlib"
 flashsv_encoder_deps="zlib"
 dxa_decoder_deps="zlib"
 flashsv_decoder_deps="zlib"
 flashsv_encoder_deps="zlib"

-flv_decoder_deps="h263_decoder"
-h263_decoder_deps="h263_parser mpeg4video_parser"
-h263i_decoder_deps="h263_decoder"
-h264_decoder_deps="h264_parser"

 mpeg_xvmc_decoder_deps="xvmc"
 mpeg_xvmc_decoder_deps="xvmc"

-mpeg4_decoder_deps="h263_decoder"
-msmpeg4v1_decoder_deps="h263_decoder"
-msmpeg4v2_decoder_deps="h263_decoder"
-msmpeg4v3_decoder_deps="h263_decoder"

 png_decoder_deps="zlib"
 png_encoder_deps="zlib"
 png_decoder_deps="zlib"
 png_encoder_deps="zlib"

-svq3_decoder_deps="h264_parser"
-vc1_decoder_deps="h263_decoder"
-wmv1_decoder_deps="h263_decoder"
-wmv2_decoder_deps="h263_decoder"
-wmv3_decoder_deps="h263_decoder"

 zmbv_decoder_deps="zlib"
 zmbv_encoder_deps="zlib"
 
 zmbv_decoder_deps="zlib"
 zmbv_encoder_deps="zlib"
 


@@ -838,8 +854,10 @@ redir_demuxer_deps="network"
 rtp_muxer_deps="network rtp_protocol"
 rtsp_demuxer_deps="sdp_demuxer"
 sdp_demuxer_deps="rtp_protocol mpegts_demuxer"
 rtp_muxer_deps="network rtp_protocol"
 rtsp_demuxer_deps="sdp_demuxer"
 sdp_demuxer_deps="rtp_protocol mpegts_demuxer"

-v4l2_demuxer_deps="linux_videodev2_h"

 v4l_demuxer_deps="linux_videodev_h"
 v4l_demuxer_deps="linux_videodev_h"

+v4l2_demuxer_deps="linux_videodev2_h"
+vfwcap_demuxer_deps="capCreateCaptureWindow"
+vfwcap_demuxer_extralibs="-lvfw32"

 x11_grab_device_demuxer_deps="x11grab XShmCreateImage"
 x11_grab_device_demuxer_extralibs="-lX11 -lXext"
 
 x11_grab_device_demuxer_deps="x11grab XShmCreateImage"
 x11_grab_device_demuxer_extralibs="-lX11 -lXext"
 


@@ -849,6 +867,9 @@ rtp_protocol_deps="udp_protocol"
 tcp_protocol_deps="network"
 udp_protocol_deps="network"
 
 tcp_protocol_deps="network"
 udp_protocol_deps="network"
 

+# filters
+movie_filter_deps="avfilter_lavf"
+

 # programs
 ffplay_deps="sdl"
 ffserver_deps="ffm_muxer rtp_protocol rtsp_demuxer"
 # programs
 ffplay_deps="sdl"
 ffserver_deps="ffm_muxer rtp_protocol rtsp_demuxer"


@@ -856,37 +877,22 @@ ffserver_extralibs='$ldl'
 vhook_extralibs='$ldl'
 
 
 vhook_extralibs='$ldl'
 
 

-# set temporary file name
-if test ! -z "$TMPDIR" ; then
-    TMPDIR1="${TMPDIR}"
-elif test ! -z "$TEMPDIR" ; then
-    TMPDIR1="${TEMPDIR}"
-else
-    TMPDIR1="/tmp"
-fi
-
-TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c"
-TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
-TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}"
-TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
-TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
-

 # default parameters
 
 # default parameters
 

-enable logging

 logfile="config.err"
 
 # installation paths
 logfile="config.err"
 
 # installation paths

-PREFIX="/usr/local"
+prefix="/usr/local"

 libdir='$(PREFIX)/lib'
 shlibdir="$libdir"
 libdir='$(PREFIX)/lib'
 shlibdir="$libdir"

-incdir='$(PREFIX)/include/ffmpeg'
+incdir='$(PREFIX)/include'

 mandir='$(PREFIX)/share/man'
 bindir='$(PREFIX)/bin'
 
 # toolchain
 cc="gcc"
 ar="ar"
 mandir='$(PREFIX)/share/man'
 bindir='$(PREFIX)/bin'
 
 # toolchain
 cc="gcc"
 ar="ar"

+nm="nm"

 ranlib="ranlib"
 make="make"
 strip="strip"
 ranlib="ranlib"
 make="make"
 strip="strip"


@@ -898,31 +904,30 @@ arch=`uname -m`
 cpu="generic"
 
 # OS
 cpu="generic"
 
 # OS

-targetos=$(tolower $(uname -s))
+target_os=$(tolower $(uname -s))

 
 # libraries
 enable zlib
 
 # configurable options
 enable debug
 
 # libraries
 enable zlib
 
 # configurable options
 enable debug

-enable dostrip

 enable ffmpeg
 enable ffplay
 enable ffserver
 enable ipv6
 enable ffmpeg
 enable ffplay
 enable ffserver
 enable ipv6

-enable static

 enable mpegaudio_hp
 enable network
 enable optimizations
 enable protocols
 enable mpegaudio_hp
 enable network
 enable optimizations
 enable protocols

+enable static
+enable stripping

 vhook="default"
 
 # build settings
 vhook="default"
 
 # build settings

-SHFLAGS='-shared -Wl,-soname,$@'
+SHFLAGS='-shared -Wl,-soname,$(SLIBNAME_WITH_MAJOR)'

 VHOOKSHFLAGS='$(SHFLAGS)'
 LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
 FFSERVERLDFLAGS=-Wl,-E
 VHOOKSHFLAGS='$(SHFLAGS)'
 LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
 FFSERVERLDFLAGS=-Wl,-E

-LDCONFIG="ldconfig"

 LIBPREF="lib"
 LIBSUF=".a"
 FULLNAME='$(NAME)$(BUILDSUF)'
 LIBPREF="lib"
 LIBSUF=".a"
 FULLNAME='$(NAME)$(BUILDSUF)'


@@ -934,6 +939,10 @@ SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
 SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
 LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
 
 SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
 LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
 

+# gcc stupidly only outputs the basename of targets with -MM
+DEPEND_CMD='$(CC) -MM $(CFLAGS) $(filter-out %.h,$^) | sed "s,[0-9a-z._-]*: \($(SRC_DIR)/\)*\([a-z0-9]*/\)[^/]* ,\\2&,"'
+VHOOK_DEPEND_CMD='$(CC) -MM $(VHOOKCFLAGS) $(filter-out %.h,$^) | sed "s,^\([a-z]\),vhook/\\1,"'
+

 # find source path
 source_path="`dirname \"$0\"`"
 enable source_path_used
 # find source path
 source_path="`dirname \"$0\"`"
 enable source_path_used


@@ -948,15 +957,23 @@ fi
 
 FFMPEG_CONFIGURATION="$@"
 
 
 FFMPEG_CONFIGURATION="$@"
 

-ENCODER_LIST=`sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' "$source_path/libavcodec/allcodecs.c"`
-DECODER_LIST=`sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' "$source_path/libavcodec/allcodecs.c"`
-PARSER_LIST=`sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' "$source_path/libavcodec/allcodecs.c"`
-BSF_LIST=`sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' "$source_path/libavcodec/allcodecs.c"`
-MUXER_LIST=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavformat/allformats.c"`
-DEMUXER_LIST=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavformat/allformats.c"`
-OUTDEV_LIST=`sed -n 's/^[^#]*_MUX.*(.*, *\(.*\)).*/\1_muxer/p' "$source_path/libavdevice/alldevices.c"`
-INDEV_LIST=`sed -n 's/^[^#]*DEMUX.*(.*, *\(.*\)).*/\1_demuxer/p' "$source_path/libavdevice/alldevices.c"`
-PROTOCOL_LIST=`sed -n 's/^[^#]*PROTOCOL.*(.*, *\(.*\)).*/\1_protocol/p' "$source_path/libavformat/allformats.c"`
+find_things(){
+    thing=$1
+    pattern=$2
+    file=$source_path/$3
+    sed -n "s/^[^#]*$pattern.*([^,]*, *\([^,]*\)\(,.*\)*).*/\1_$thing/p" "$file"
+}
+
+ENCODER_LIST=$(find_things  encoder  ENC      libavcodec/allcodecs.c)
+DECODER_LIST=$(find_things  decoder  DEC      libavcodec/allcodecs.c)
+PARSER_LIST=$(find_things   parser   PARSER   libavcodec/allcodecs.c)
+BSF_LIST=$(find_things      bsf      BSF      libavcodec/allcodecs.c)
+MUXER_LIST=$(find_things    muxer    _MUX     libavformat/allformats.c)
+DEMUXER_LIST=$(find_things  demuxer  DEMUX    libavformat/allformats.c)
+OUTDEV_LIST=$(find_things   muxer    _MUX     libavdevice/alldevices.c)
+INDEV_LIST=$(find_things    demuxer  DEMUX    libavdevice/alldevices.c)
+PROTOCOL_LIST=$(find_things protocol PROTOCOL libavformat/allformats.c)
+FILTER_LIST=$(find_things   filter   FILTER   libavfilter/allfilters.c)

 
 enable $ARCH_EXT_LIST \
        $DECODER_LIST \
 
 enable $ARCH_EXT_LIST \
        $DECODER_LIST \


@@ -965,6 +982,7 @@ enable $ARCH_EXT_LIST \
        $BSF_LIST \
        $DEMUXER_LIST \
        $MUXER_LIST \
        $BSF_LIST \
        $DEMUXER_LIST \
        $MUXER_LIST \

+       $FILTER_LIST \

        $PROTOCOL_LIST \
        $INDEV_LIST \
        $OUTDEV_LIST \
        $PROTOCOL_LIST \
        $INDEV_LIST \
        $OUTDEV_LIST \


@@ -985,75 +1003,32 @@ show_list() {
 for opt do
     optval="${opt#*=}"
     case "$opt" in
 for opt do
     optval="${opt#*=}"
     case "$opt" in

-    --log)
-    ;;
-    --log=*) logging="$optval"
-    ;;
-    --prefix=*) PREFIX="$optval"
-    ;;
-    --libdir=*) libdir="$optval"
-    ;;
-    --shlibdir=*) shlibdir="$optval"
-    ;;
-    --incdir=*) incdir="$optval"
-    ;;
-    --mandir=*) mandir="$optval"
-    ;;
-    --source-path=*) source_path="$optval"
-    ;;
-    --cross-prefix=*) cross_prefix="$optval"
-    ;;
-    --cross-compile) enable cross_compile
-    ;;
-    --target-os=*) targetos="$optval"
-    ;;
-    --cc=*) cc="$optval"
-    ;;
-    --make=*) make="$optval"
-    ;;

     --extra-cflags=*) add_cflags "$optval"
     ;;
     --extra-ldflags=*) add_ldflags "$optval"
     ;;
     --extra-libs=*) add_extralibs "$optval"
     ;;
     --extra-cflags=*) add_cflags "$optval"
     ;;
     --extra-ldflags=*) add_ldflags "$optval"
     ;;
     --extra-libs=*) add_extralibs "$optval"
     ;;

-    --build-suffix=*) BUILDSUF="$optval"
-    ;;
-    --arch=*) arch="$optval"
-    ;;
-    --cpu=*) cpu="$optval"
-    ;;
-    --enable-sunmlib) enable mlib
-    ;;
-    --disable-strip) disable dostrip
-    ;;
-    --disable-encoders) disable $ENCODER_LIST
-    ;;
-    --disable-decoders) disable $DECODER_LIST
-    ;;
-    --disable-muxers) disable $MUXER_LIST
-    ;;
-    --disable-demuxers) disable $DEMUXER_LIST
-    ;;
-    --disable-parsers) disable $PARSER_LIST
-    ;;
-    --disable-bsfs) disable $BSF_LIST
-    ;;
-    --disable-protocols) disable $PROTOCOL_LIST
-    ;;

     --disable-devices) disable $INDEV_LIST $OUTDEV_LIST
     ;;
     --disable-devices) disable $INDEV_LIST $OUTDEV_LIST
     ;;

+    --enable-debug=*) debuglevel="$optval"
+    ;;

     --enable-*=*|--disable-*=*)
     eval `echo "$opt" | sed 's/=/-/;s/--/action=/;s/-/ thing=/;s/-/ name=/'`
     case "$thing" in
     --enable-*=*|--disable-*=*)
     eval `echo "$opt" | sed 's/=/-/;s/--/action=/;s/-/ thing=/;s/-/ name=/'`
     case "$thing" in

-        encoder|decoder|muxer|demuxer|parser|bsf|protocol) $action ${optval}_${thing} ;;
+        encoder|decoder|muxer|demuxer|parser|bsf|protocol|filter) $action ${optval}_${thing} ;;

         *) die_unknown "$opt" ;;
     esac
     ;;
     --enable-?*|--disable-?*)
     eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
         *) die_unknown "$opt" ;;
     esac
     ;;
     --enable-?*|--disable-?*)
     eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`

-    echo "$CMDLINE_SELECT" | grep -q "^ *$option\$" || die_unknown $opt
-    $action $option
+    if is_in $option $COMPONENT_LIST; then
+        eval $action \$$(toupper ${option%s})_LIST
+    elif is_in $option $CMDLINE_SELECT; then
+        $action $option
+    else
+        die_unknown $opt
+    fi

     ;;
     --list-*)
         NAME="${opt#--list-}"
     ;;
     --list-*)
         NAME="${opt#--list-}"


@@ -1064,88 +1039,19 @@ for opt do
     --help|-h) show_help
     ;;
     *)
     --help|-h) show_help
     ;;
     *)

-    die_unknown $opt
+    optname="${opt%=*}"
+    optname="${optname#--}"
+    optname=$(echo "$optname" | sed 's/-/_/g')
+    is_in $optname $CMDLINE_SET || die_unknown $opt
+    eval $optname='$optval'

     ;;
     esac
 done
 
     ;;
     esac
 done
 

-case "$arch" in
-    i386|i486|i586|i686|i86pc|BePC)
-        arch="x86_32"
-        enable fast_unaligned
-    ;;
-    x86_64|amd64)
-        arch="x86_32"
-        enable fast_unaligned
-        canon_arch="`$cc -dumpmachine | sed -e 's,\([^-]*\)-.*,\1,'`"
-        if [ x"$canon_arch" = x"x86_64" -o x"$canon_arch" = x"amd64" ]; then
-            if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
-                arch="x86_64"
-                enable fast_64bit
-            fi
-        fi
-    ;;
-    # armv4l is a subset of armv[567]*l
-    arm|armv[4567]*l)
-        arch="armv4l"
-    ;;
-    alpha)
-        arch="alpha"
-        enable fast_64bit
-    ;;
-    "Power Macintosh"|ppc|powerpc)
-        arch="powerpc"
-    ;;
-    ppc64)
-        arch="powerpc"
-        enable fast_64bit
-    ;;
-    mips|mipsel|IP*)
-        arch="mips"
-    ;;
-    sun4u|sparc64)
-        arch="sparc64"
-        enable fast_64bit
-    ;;
-    sparc)
-        arch="sparc"
-    ;;
-    sh4)
-        arch="sh4"
-    ;;
-    parisc)
-        arch="parisc"
-    ;;
-    parisc64)
-        arch="parisc"
-        enable fast_64bit
-    ;;
-    s390|s390x)
-        arch="s390"
-    ;;
-    m68k)
-        arch="m68k"
-    ;;
-    ia64)
-        arch="ia64"
-        enable fast_64bit
-    ;;
-    bfin)
-        arch="bfin"
-    ;;
-    *)
-        arch="unknown"
-    ;;
-esac
-
-enable $arch
-enabled_any x86_32 x86_64 && enable x86
-enabled     sparc64       && enable sparc
-

 # OS specific
 # OS specific

-case $targetos in
+case $target_os in

     beos|haiku|zeta)
     beos|haiku|zeta)

-        PREFIX="$HOME/config"
+        prefix="$HOME/config"

         # helps building libavcodec
         add_cflags "-DPIC -fomit-frame-pointer"
         # 3 gcc releases known for BeOS, each with ugly bugs
         # helps building libavcodec
         add_cflags "-DPIC -fomit-frame-pointer"
         # 3 gcc releases known for BeOS, each with ugly bugs


@@ -1158,14 +1064,13 @@ case $targetos in
             add_cflags "-fno-expensive-optimizations"
             ;;
         esac
             add_cflags "-fno-expensive-optimizations"
             ;;
         esac

-        LDCONFIG="echo ignoring ldconfig"

         SHFLAGS=-nostart
         # enable BeOS things
         enable audio_beos
         # no need for libm, but the inet stuff
         # Check for BONE
         # XXX: actually should check for NOT net_server
         SHFLAGS=-nostart
         # enable BeOS things
         enable audio_beos
         # no need for libm, but the inet stuff
         # Check for BONE
         # XXX: actually should check for NOT net_server

-        if (echo $BEINCLUDES|grep 'headers/be/bone' >/dev/null); then
+        if echo $BEINCLUDES | grep -q 'headers/be/bone'; then

             network_extralibs="-lbind -lsocket"
         else
             enable beos_netserver
             network_extralibs="-lbind -lsocket"
         else
             enable beos_netserver


@@ -1173,7 +1078,7 @@ case $targetos in
         fi ;;
     sunos)
         FFSERVERLDFLAGS=""
         fi ;;
     sunos)
         FFSERVERLDFLAGS=""

-        SHFLAGS='-shared -Wl,-h,$@'
+        SHFLAGS='-shared -Wl,-h,$(SLIBNAME_WITH_MAJOR)'

         network_extralibs="-lsocket -lnsl"
         ;;
     netbsd)
         network_extralibs="-lsocket -lnsl"
         ;;
     netbsd)


@@ -1183,7 +1088,6 @@ case $targetos in
     openbsd)
         disable need_memalign
         LIBOBJFLAGS='$(PIC)'
     openbsd)
         disable need_memalign
         LIBOBJFLAGS='$(PIC)'

-        LDCONFIG='ldconfig -m $(SHLIBDIR)'

         SHFLAGS='-shared'
         SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF).$(LIBVERSION)'
         SLIBNAME_WITH_VERSION='$(SLIBNAME)'
         SHFLAGS='-shared'
         SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF).$(LIBVERSION)'
         SLIBNAME_WITH_VERSION='$(SLIBNAME)'


@@ -1200,7 +1104,7 @@ case $targetos in
         ;;
     darwin)
         disable need_memalign
         ;;
     darwin)
         disable need_memalign

-        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(SPPVERSION),-compatibility_version,$(SPPVERSION) -Wl,-read_only_relocs,suppress'
+        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR) -Wl,-read_only_relocs,suppress'

         VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$@'
         strip="strip -x"
         FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
         VHOOKSHFLAGS='-dynamiclib -Wl,-single_module -flat_namespace -undefined suppress -Wl,-install_name,$(SHLIBDIR)/vhook/$@'
         strip="strip -x"
         FFLDFLAGS="-Wl,-dynamic,-search_paths_first"


@@ -1210,11 +1114,11 @@ case $targetos in
         FFSERVERLDFLAGS=-Wl,-bind_at_load
         ;;
     mingw32*)
         FFSERVERLDFLAGS=-Wl,-bind_at_load
         ;;
     mingw32*)

-        targetos=mingw32
+        target_os=mingw32

         shlibdir="$bindir"
         VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
         VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
         shlibdir="$bindir"
         VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
         VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'

-        if enabled swscaler; then
+        if enabled swscale; then

             VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
             VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
         fi
             VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
             VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
         fi


@@ -1230,11 +1134,11 @@ case $targetos in
         SHFLAGS='-shared -Wl,--output-def,$(@:$(SLIBSUF)=.def) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
         ;;
     cygwin*)
         SHFLAGS='-shared -Wl,--output-def,$(@:$(SLIBSUF)=.def) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
         ;;
     cygwin*)

-        targetos=cygwin
+        target_os=cygwin

         shlibdir="$bindir"
         VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
         VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
         shlibdir="$bindir"
         VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
         VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'

-        if enabled swscaler; then
+        if enabled swscale; then

             VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
             VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
         fi
             VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
             VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
         fi


@@ -1246,7 +1150,6 @@ case $targetos in
         SHFLAGS='-shared -Wl,--enable-auto-image-base'
         ;;
     *-dos|freedos|opendos)
         SHFLAGS='-shared -Wl,--enable-auto-image-base'
         ;;
     *-dos|freedos|opendos)

-        enable memalign_hack

         disable ffplay ffserver vhook
         disable $INDEV_LIST $OUTDEV_LIST
         network_extralibs="-lsocket"
         disable ffplay ffserver vhook
         disable $INDEV_LIST $OUTDEV_LIST
         network_extralibs="-lsocket"


@@ -1257,20 +1160,17 @@ case $targetos in
         enable dv1394
         ;;
     irix*)
         enable dv1394
         ;;
     irix*)

-        targetos=irix
+        target_os=irix

         ranlib="echo ignoring ranlib"
         ;;
     os/2*)
         ranlib="echo ignoring ranlib"
         ;;
     os/2*)

-        ar="emxomfar -p256"
-        ranlib="echo ignoring ranlib"

         strip="lxlite"
         ln_s="cp -f"
         strip="lxlite"
         ln_s="cp -f"

-        add_cflags "-Zomf"

         EXESUF=".exe"
         FFLDFLAGS="-Zomf -Zbin-files -Zargs-wild -Zmap"
         SHFLAGS='$(NAME).def -Zdll -Zomf'
         FFSERVERLDFLAGS=""
         EXESUF=".exe"
         FFLDFLAGS="-Zomf -Zbin-files -Zargs-wild -Zmap"
         SHFLAGS='$(NAME).def -Zdll -Zomf'
         FFSERVERLDFLAGS=""

-        LIBSUF="_s.lib"
+        LIBSUF="_s.a"

         SLIBPREF=""
         SLIBSUF=".dll"
         SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
         SLIBPREF=""
         SLIBSUF=".dll"
         SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'


@@ -1285,30 +1185,117 @@ case $targetos in
           emximp -o $(LIBPREF)$(NAME)_dll.lib $(NAME).def;'
         SLIB_INSTALL_EXTRA_CMD='install -m 644 $(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib "$(LIBDIR)"'
         SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.a "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.lib'
           emximp -o $(LIBPREF)$(NAME)_dll.lib $(NAME).def;'
         SLIB_INSTALL_EXTRA_CMD='install -m 644 $(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib "$(LIBDIR)"'
         SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.a "$(LIBDIR)"/$(LIBPREF)$(NAME)_dll.lib'

-        vhook="no"
+        disable vhook
+        ;;
+    interix)
+        disable vhook

         ;;
 
     *)
         ;;
 
     *)

-        targetos="${targetos}-UNKNOWN"
+        target_os="${target_os}-UNKNOWN"

         ;;
 esac
 
         ;;
 esac
 

-add_extralibs $osextralibs
-
-if ! disabled logging ; then
-    enabled logging || logfile="$logging"
-    echo "# $0 $@" >$logfile
-    set >>$logfile
+# set temporary file name
+if test ! -z "$TMPDIR" ; then
+    TMPDIR1="${TMPDIR}"
+elif test ! -z "$TEMPDIR" ; then
+    TMPDIR1="${TEMPDIR}"

 else
 else

-    logfile=/dev/null
+    TMPDIR1="/tmp"

 fi
 
 fi
 

+TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c"
+TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}"
+TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
+TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
+TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
+TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
+
+
+add_extralibs $osextralibs
+
+disabled logging && logfile=/dev/null
+
+echo "# $0 $@" >$logfile
+set >>$logfile
+
+case "$arch" in
+    i386|i486|i586|i686|i86pc|BePC)
+        arch="x86_32"
+        enable fast_unaligned
+    ;;
+    x86_64|amd64)
+        arch="x86_32"
+        enable fast_unaligned
+        check_cc <<EOF && enable fast_64bit && arch="x86_64"
+        int test[sizeof(char*) - 7];
+EOF
+    ;;
+    # armv4l is a subset of armv[567]*l
+    arm|armv[4567]*l)
+        arch="armv4l"
+    ;;
+    alpha)
+        arch="alpha"
+        enable fast_64bit
+    ;;
+    "Power Macintosh"|ppc|powerpc)
+        arch="powerpc"
+    ;;
+    ppc64)
+        arch="powerpc"
+        enable fast_64bit
+    ;;
+    mips|mipsel|IP*)
+        arch="mips"
+    ;;
+    sun4u|sparc64)
+        arch="sparc64"
+        enable fast_64bit
+    ;;
+    sparc)
+        arch="sparc"
+    ;;
+    sh4)
+        arch="sh4"
+    ;;
+    parisc)
+        arch="parisc"
+    ;;
+    parisc64)
+        arch="parisc"
+        enable fast_64bit
+    ;;
+    s390|s390x)
+        arch="s390"
+    ;;
+    m68k)
+        arch="m68k"
+    ;;
+    ia64)
+        arch="ia64"
+        enable fast_64bit
+    ;;
+    bfin)
+        arch="bfin"
+    ;;
+    *)
+        arch="unknown"
+    ;;
+esac
+
+enable $arch
+enabled_any x86_32 x86_64 && enable x86
+enabled     sparc64       && enable sparc
+

 # Combine FFLDFLAGS and the LDFLAGS environment variable.
 LDFLAGS="$FFLDFLAGS $LDFLAGS"
 
 test -n "$cross_prefix" && enable cross_compile
 cc="${cross_prefix}${cc}"
 ar="${cross_prefix}${ar}"
 # Combine FFLDFLAGS and the LDFLAGS environment variable.
 LDFLAGS="$FFLDFLAGS $LDFLAGS"
 
 test -n "$cross_prefix" && enable cross_compile
 cc="${cross_prefix}${cc}"
 ar="${cross_prefix}${ar}"

+nm="${cross_prefix}${nm}"

 ranlib="${cross_prefix}${ranlib}"
 strip="${cross_prefix}${strip}"
 
 ranlib="${cross_prefix}${ranlib}"
 strip="${cross_prefix}${strip}"
 


@@ -1347,13 +1334,17 @@ if ! enabled gpl; then
         shift
         enabled_any $@ && die "$name is under GPL and --enable-gpl is not specified."
     }
         shift
         enabled_any $@ && die "$name is under GPL and --enable-gpl is not specified."
     }

-    die_gpl_disabled "The Postprocessing code" pp
+    die_gpl_disabled "The Postprocessing code" postproc

     die_gpl_disabled "liba52"                  liba52
     die_gpl_disabled "libx264"                 libx264
     die_gpl_disabled "libxvidcore"             libxvid
     die_gpl_disabled "FAAD2"                   libfaad2
     die_gpl_disabled "The X11 grabber"         x11grab
     die_gpl_disabled "liba52"                  liba52
     die_gpl_disabled "libx264"                 libx264
     die_gpl_disabled "libxvidcore"             libxvid
     die_gpl_disabled "FAAD2"                   libfaad2
     die_gpl_disabled "The X11 grabber"         x11grab

-    die_gpl_disabled "The software scaler"     swscaler
+    die_gpl_disabled "The software scaler"     swscale
+fi
+
+if ! enabled nonfree && enabled_any libamr_nb libamr_wb; then
+    die "libamr is nonfree and --enable-nonfree is not specified."

 fi
 
 check_deps $ARCH_EXT_LIST
 fi
 
 check_deps $ARCH_EXT_LIST


@@ -1361,14 +1352,14 @@ check_deps $ARCH_EXT_LIST
 test -z "$need_memalign" && need_memalign="$mmx"
 
 #Darwin CC versions
 test -z "$need_memalign" && need_memalign="$mmx"
 
 #Darwin CC versions

-if test $targetos = darwin; then
-    if test -n "`$cc -v 2>&1 | grep xlc`"; then
+if test $target_os = darwin; then
+    if $cc -v 2>&1 | grep -q xlc; then

         add_cflags "-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
     else
         add_cflags "-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
     else

-        add_cflags "-no-cpp-precomp -pipe"
+        add_cflags "-pipe"

         check_cflags "-force_cpusubtype_ALL"
         check_cflags "-Wno-sign-compare"
         check_cflags "-force_cpusubtype_ALL"
         check_cflags "-Wno-sign-compare"

-        disabled shared && add_cflags -mdynamic-no-pic
+        enabled shared || add_cflags -mdynamic-no-pic

     fi
 fi
 
     fi
 fi
 


@@ -1426,7 +1417,7 @@ if test $cpu != "generic"; then
             enable fast_cmov
         ;;
         # targets that do support conditional mov but on which it's slow
             enable fast_cmov
         ;;
         # targets that do support conditional mov but on which it's slow

-        pentium4|prescott|nocona)
+        pentium4|pentium4m|prescott|nocona)

             add_cflags "-march=$cpu"
             enable cmov
             disable fast_cmov
             add_cflags "-march=$cpu"
             enable cmov
             disable fast_cmov


@@ -1434,10 +1425,6 @@ if test $cpu != "generic"; then
         sparc64)
             add_cflags "-mcpu=v9"
         ;;
         sparc64)
             add_cflags "-mcpu=v9"
         ;;

-        bf*) #bf531 bf532 bf533 bf561 bf5xx all get this config
-            add_cflags "-mfdpic"
-            add_ldflags "-mfdpic"
-        ;;

         arm*)
             add_cflags "-mcpu=$cpu"
         ;;
         arm*)
             add_cflags "-mcpu=$cpu"
         ;;


@@ -1456,11 +1443,11 @@ if ! gnu_make $make; then
 fi
 
 # make sure we can execute files in $TMPDIR
 fi
 
 # make sure we can execute files in $TMPDIR

-cat >$TMPE 2>>$logfile <<EOF
+cat >$TMPSH 2>>$logfile <<EOF

 #! /bin/sh
 EOF
 #! /bin/sh
 EOF

-chmod +x $TMPE >>$logfile 2>&1
-if ! $TMPE >>$logfile 2>&1; then
+chmod +x $TMPSH >>$logfile 2>&1
+if ! $TMPSH >>$logfile 2>&1; then

     cat <<EOF
 Unable to create and execute files in $TMPDIR1.  Set the TMPDIR environment
 variable to another directory and make sure that $TMPDIR1 is not mounted
     cat <<EOF
 Unable to create and execute files in $TMPDIR1.  Set the TMPDIR environment
 variable to another directory and make sure that $TMPDIR1 is not mounted


@@ -1468,23 +1455,29 @@ noexec.
 EOF
     die "Sanity test failed."
 fi
 EOF
     die "Sanity test failed."
 fi

-rm $TMPE
+rm $TMPSH

 
 # compiler sanity check
 check_exec <<EOF
 
 # compiler sanity check
 check_exec <<EOF

-int main(void){
-    return 0;
-}
+int main(void){ return 0; }

 EOF
 if test "$?" != 0; then
     echo "$cc is unable to create an executable file."
     if test -z "$cross_prefix" && ! enabled cross_compile ; then
 EOF
 if test "$?" != 0; then
     echo "$cc is unable to create an executable file."
     if test -z "$cross_prefix" && ! enabled cross_compile ; then

-        echo "If $cc is a cross-compiler, use the --cross-compile option."
+        echo "If $cc is a cross-compiler, use the --enable-cross-compile option."

         echo "Only do this if you know what cross compiling means."
     fi
     die "C compiler test failed."
 fi
 
         echo "Only do this if you know what cross compiling means."
     fi
     die "C compiler test failed."
 fi
 

+check_cc <<EOF || die "Symbol mangling check failed."
+int ff_extern;
+EOF
+sym=$($nm -P -g $TMPO)
+extern_prefix=${sym%%ff_extern*}
+
+check_asm inline_asm '""'
+

 if enabled x86; then
     # check whether EBP is available on x86
     # As 'i' is stored on the stack, this program will crash
 if enabled x86; then
     # check whether EBP is available on x86
     # As 'i' is stored on the stack, this program will crash


@@ -1501,8 +1494,11 @@ EOF
     # check wether EBX is available on x86
     check_asm ebx_available '"":::"%ebx"'
 
     # check wether EBX is available on x86
     check_asm ebx_available '"":::"%ebx"'
 

-    # check whether binutils is new enough to compile SSSE3
+    # check whether binutils is new enough to compile SSSE3/MMX2

     enabled ssse3 && check_asm ssse3 '"pabsw %xmm0, %xmm0"'
     enabled ssse3 && check_asm ssse3 '"pabsw %xmm0, %xmm0"'

+    enabled mmx2  && check_asm mmx2  '"movss %xmm0, %xmm0"'
+
+    check_asm bswap '"bswap %%eax" ::: "%eax"'

 fi
 
 # check for assembler specific support
 fi
 
 # check for assembler specific support


@@ -1522,11 +1518,9 @@ fi
 
 # AltiVec flags: The FSF version of GCC differs from the Apple version
 if enabled altivec; then
 
 # AltiVec flags: The FSF version of GCC differs from the Apple version
 if enabled altivec; then

-    test -n "`$cc -v 2>&1 | grep version | grep Apple`" &&
-        add_cflags "-faltivec" ||
-        add_cflags "-maltivec -mabi=altivec"
-
-    check_header altivec.h
+    check_cflags -maltivec -mabi=altivec &&
+        check_header altivec.h ||
+        check_cflags -faltivec

 
     # check if our compiler supports Motorola AltiVec C API
     enabled altivec_h &&
 
     # check if our compiler supports Motorola AltiVec C API
     enabled altivec_h &&


@@ -1542,6 +1536,8 @@ int main(void) {
 EOF
 fi
 
 EOF
 fi
 

+# We have to check if pld is a nop and disable it.
+enabled armv4l  && check_asm pld     '"pld [r0]"'

 enabled armv5te && check_asm armv5te '"qadd r0, r0, r0"'
 enabled armv6   && check_asm armv6   '"sadd16 r0, r0, r0"'
 enabled iwmmxt  && check_asm iwmmxt  '"wunpckelub wr6, wr4"'
 enabled armv5te && check_asm armv5te '"qadd r0, r0, r0"'
 enabled armv6   && check_asm armv6   '"sadd16 r0, r0, r0"'
 enabled iwmmxt  && check_asm iwmmxt  '"wunpckelub wr6, wr4"'


@@ -1555,7 +1551,7 @@ enabled vis && add_cflags "-mcpu=ultrasparc -mtune=ultrasparc"
 check_cc <<EOF || die "endian test failed"
 unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
 EOF
 check_cc <<EOF || die "endian test failed"
 unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
 EOF

-grep -q BIGE $TMPO && enable bigendian
+od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian

 
 # ---
 # check availability of some header files
 
 # ---
 # check availability of some header files


@@ -1569,7 +1565,7 @@ fi
 check_func  fork
 check_func  gethrtime
 check_func  getrusage
 check_func  fork
 check_func  gethrtime
 check_func  getrusage

-check_func  inet_aton
+check_func  inet_aton $network_extralibs

 check_func  memalign
 check_func  mkstemp
 check_func2 windows.h GetProcessTimes
 check_func  memalign
 check_func  mkstemp
 check_func2 windows.h GetProcessTimes


@@ -1578,6 +1574,7 @@ check_header byteswap.h
 check_header conio.h
 check_header dlfcn.h
 check_header malloc.h
 check_header conio.h
 check_header dlfcn.h
 check_header malloc.h

+check_header sys/mman.h

 check_header termios.h
 
 if ! enabled_any memalign memalign_hack && enabled need_memalign ; then
 check_header termios.h
 
 if ! enabled_any memalign memalign_hack && enabled need_memalign ; then


@@ -1589,7 +1586,7 @@ enabled zlib && check_lib zlib.h zlibVersion -lz || disable zlib
 # ffserver uses poll(),
 # if it's not found we can emulate it using select().
 if enabled ffserver; then
 # ffserver uses poll(),
 # if it's not found we can emulate it using select().
 if enabled ffserver; then

-    check_header sys/poll.h
+    check_header poll.h

     check_header sys/select.h
 fi
 
     check_header sys/select.h
 fi
 


@@ -1600,10 +1597,10 @@ if enabled pthreads; then
         :
     elif check_func pthread_create -pthread; then
         add_cflags -pthread
         :
     elif check_func pthread_create -pthread; then
         add_cflags -pthread

-        add_ldflags -pthread
+        add_extralibs -pthread

     elif check_func pthread_create -pthreads; then
         add_cflags -pthreads
     elif check_func pthread_create -pthreads; then
         add_cflags -pthreads

-        add_ldflags -pthreads
+        add_extralibs -pthreads

     elif ! check_lib pthread.h pthread_create -lpthread; then
         die "ERROR: can't find pthreads library"
     fi
     elif ! check_lib pthread.h pthread_create -lpthread; then
         die "ERROR: can't find pthreads library"
     fi


@@ -1628,8 +1625,6 @@ int main(void) { return ($func(3.999f) > 0)?0:1; }
 EOF
 done
 
 EOF
 done
 

-enabled_any libamr_nb libamr_wb && enable libamr
-

 # these are off by default, so fail if requested and not available
 enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
 enabled liba52     && require  liba52 a52dec/a52.h a52_init -la52
 # these are off by default, so fail if requested and not available
 enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
 enabled liba52     && require  liba52 a52dec/a52.h a52_init -la52


@@ -1642,7 +1637,7 @@ enabled libmp3lame && require  LAME lame/lame.h lame_init -lmp3lame -lm
 enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut
 enabled libtheora  && require  libtheora theora/theora.h theora_info_init -ltheora -logg
 enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
 enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut
 enabled libtheora  && require  libtheora theora/theora.h theora_info_init -ltheora -logg
 enabled libvorbis  && require  libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg

-enabled libx264    && require  x264 x264.h x264_encoder_open -lx264
+enabled libx264    && require  x264 x264.h x264_encoder_open -lx264 -lm

 enabled libxvid    && require  Xvid xvid.h xvid_global -lxvidcore
 enabled mlib       && require  mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
 
 enabled libxvid    && require  Xvid xvid.h xvid_global -lxvidcore
 enabled mlib       && require  mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
 


@@ -1668,7 +1663,7 @@ done
 
 test "$vhook" = "default" && vhook="$dlopen"
 
 
 test "$vhook" = "default" && vhook="$dlopen"
 

-if test "$targetos" = cygwin -o "$targetos" = mingw32 && enabled_all static vhook ; then
+if test "$target_os" = cygwin -o "$target_os" = mingw32 && enabled_all static vhook ; then

     disable vhook
     echo
     echo "At the moment vhooks don't work on Cygwin or MinGW static builds."
     disable vhook
     echo
     echo "At the moment vhooks don't work on Cygwin or MinGW static builds."


@@ -1694,7 +1689,7 @@ if "${SDL_CONFIG}" --version >/dev/null 2>&1; then
     sdl_cflags=`"${SDL_CONFIG}" --cflags`
     temp_cflags $sdl_cflags
     temp_extralibs `"${SDL_CONFIG}" --libs`
     sdl_cflags=`"${SDL_CONFIG}" --cflags`
     temp_cflags $sdl_cflags
     temp_extralibs `"${SDL_CONFIG}" --libs`

-    if check_lib SDL.h SDL_Init; then
+    if check_lib2 SDL.h SDL_Init; then

         _sdlversion=`"${SDL_CONFIG}" --version | sed 's/[^0-9]//g'`
         if test "$_sdlversion" -lt 121 ; then
             enable sdl_too_old
         _sdlversion=`"${SDL_CONFIG}" --version | sed 's/[^0-9]//g'`
         if test "$_sdlversion" -lt 121 ; then
             enable sdl_too_old


@@ -1702,7 +1697,7 @@ if "${SDL_CONFIG}" --version >/dev/null 2>&1; then
             enable sdl
             check_cc $sdl_cflags <<EOF && enable sdl_video_size
 #include <SDL.h>
             enable sdl
             check_cc $sdl_cflags <<EOF && enable sdl_video_size
 #include <SDL.h>

-int main(void){
+int main(int argc, char **argv){

     const SDL_VideoInfo *vi = SDL_GetVideoInfo();
     int w = vi->current_w;
     return 0;
     const SDL_VideoInfo *vi = SDL_GetVideoInfo();
     int w = vi->current_w;
     return 0;


@@ -1751,6 +1746,8 @@ EOF
 check_header linux/videodev.h
 check_header linux/videodev2.h
 
 check_header linux/videodev.h
 check_header linux/videodev2.h
 

+check_func2 "windows.h vfw.h" capCreateCaptureWindow -lvfw32
+

 # check for ioctl_meteor.h, ioctl_bt848.h and alternatives
 { check_header dev/bktr/ioctl_meteor.h &&
   check_header dev/bktr/ioctl_bt848.h; } ||
 # check for ioctl_meteor.h, ioctl_bt848.h and alternatives
 { check_header dev/bktr/ioctl_meteor.h &&
   check_header dev/bktr/ioctl_bt848.h; } ||


@@ -1770,7 +1767,7 @@ check_header X11/extensions/XShm.h      &&
 check_func XOpenDisplay -lX11           &&
 check_func XShmCreateImage -lX11 -lXext
 
 check_func XOpenDisplay -lX11           &&
 check_func XShmCreateImage -lX11 -lXext
 

-enabled debug && add_cflags -g
+enabled debug && add_cflags -g"$debuglevel"

 
 # add some useful compiler flags if supported
 check_cflags -Wdeclaration-after-statement
 
 # add some useful compiler flags if supported
 check_cflags -Wdeclaration-after-statement


@@ -1780,6 +1777,9 @@ check_cflags -Wdisabled-optimization
 check_cflags -Wpointer-arith
 check_cflags -Wredundant-decls
 check_cflags -Wno-pointer-sign
 check_cflags -Wpointer-arith
 check_cflags -Wredundant-decls
 check_cflags -Wno-pointer-sign

+check_cflags -Wcast-qual
+check_cflags -Wwrite-strings
+check_cflags -Wtype-limits

 enabled extra_warnings && check_cflags -Winline
 
 # add some linker flags
 enabled extra_warnings && check_cflags -Winline
 
 # add some linker flags


@@ -1791,13 +1791,15 @@ if enabled small; then
     check_cflags -Os            # not all compilers support -Os
     optimizations="small"
 elif enabled optimizations; then
     check_cflags -Os            # not all compilers support -Os
     optimizations="small"
 elif enabled optimizations; then

-    if test -n "`$cc -v 2>&1 | grep xlc`"; then
+    if $cc -v 2>&1 | grep -q xlc; then

         add_cflags  "-O5"
         add_ldflags "-O5"
     else
         add_cflags "-O3"
     fi
 fi
         add_cflags  "-O5"
         add_ldflags "-O5"
     else
         add_cflags "-O3"
     fi
 fi

+check_cflags -fno-math-errno
+check_cflags -fno-signed-zeros

 
 # PIC flags for shared library objects where they are needed
 if enabled shared; then
 
 # PIC flags for shared library objects where they are needed
 if enabled shared; then


@@ -1827,6 +1829,7 @@ enabled_any $ENCODER_LIST      && enable encoders
 enabled_any $BSF_LIST          && enable bsfs
 enabled_any $DEMUXER_LIST      && enable demuxers
 enabled_any $MUXER_LIST        && enable muxers
 enabled_any $BSF_LIST          && enable bsfs
 enabled_any $DEMUXER_LIST      && enable demuxers
 enabled_any $MUXER_LIST        && enable muxers

+enabled_any $FILTER_LIST       && enable filters

 enabled_any $INDEV_LIST        && enable demuxers
 enabled_any $OUTDEV_LIST       && enable muxers
 enabled_any $PROTOCOL_LIST     && enable protocols
 enabled_any $INDEV_LIST        && enable demuxers
 enabled_any $OUTDEV_LIST       && enable muxers
 enabled_any $PROTOCOL_LIST     && enable protocols


@@ -1841,6 +1844,7 @@ check_deps $CONFIG_LIST       \
            $BSF_LIST          \
            $DEMUXER_LIST      \
            $MUXER_LIST        \
            $BSF_LIST          \
            $DEMUXER_LIST      \
            $MUXER_LIST        \

+           $FILTER_LIST       \

            $INDEV_LIST        \
            $OUTDEV_LIST       \
            $PROTOCOL_LIST     \
            $INDEV_LIST        \
            $OUTDEV_LIST       \
            $PROTOCOL_LIST     \


@@ -1849,14 +1853,14 @@ enabled libdc1394 && append pkg_requires "libraw1394"
 enabled libtheora && append pkg_requires "theora"
 enabled libvorbis && append pkg_requires "vorbisenc"
 
 enabled libtheora && append pkg_requires "theora"
 enabled libvorbis && append pkg_requires "vorbisenc"
 

-echo "install prefix            $PREFIX"
+echo "install prefix            $prefix"

 echo "source path               $source_path"
 echo "C compiler                $cc"
 echo "make                      $make"
 echo ".align is power-of-two    $asmalign_pot"
 echo "ARCH                      $arch ($cpu)"
 echo "source path               $source_path"
 echo "C compiler                $cc"
 echo "make                      $make"
 echo ".align is power-of-two    $asmalign_pot"
 echo "ARCH                      $arch ($cpu)"

-if test "$BUILDSUF" != ""; then
-    echo "build suffix              $BUILDSUF"
+if test "$build_suffix" != ""; then
+    echo "build suffix              $build_suffix"

 fi
 echo "big-endian                ${bigendian-no}"
 if test $arch = "x86_32" -o $arch = "x86_64"; then
 fi
 echo "big-endian                ${bigendian-no}"
 if test $arch = "x86_32" -o $arch = "x86_64"; then


@@ -1880,12 +1884,14 @@ if test $arch = "powerpc"; then
 fi
 echo "gprof enabled             ${gprof-no}"
 echo "debug symbols             ${debug-no}"
 fi
 echo "gprof enabled             ${gprof-no}"
 echo "debug symbols             ${debug-no}"

-echo "strip symbols             ${dostrip-no}"
+echo "strip symbols             ${stripping-no}"

 echo "optimizations             ${optimizations-no}"
 echo "static                    ${static-no}"
 echo "shared                    ${shared-no}"
 echo "optimizations             ${optimizations-no}"
 echo "static                    ${static-no}"
 echo "shared                    ${shared-no}"

-echo "postprocessing support    ${pp-no}"
-echo "software scaler enabled   ${swscaler-no}"
+echo "postprocessing support    ${postproc-no}"
+echo "software scaler enabled   ${swscale-no}"
+echo "new filter support        ${avfilter-no}"
+echo "filters using lavformat   ${avfilter_lavf-no}"

 echo "video hooking             ${vhook-no}"
 if enabled vhook; then
     echo "Imlib2 support            ${imlib2-no}"
 echo "video hooking             ${vhook-no}"
 if enabled vhook; then
     echo "Imlib2 support            ${imlib2-no}"


@@ -1918,22 +1924,22 @@ echo "libvorbis enabled         ${libvorbis-no}"
 echo "x264 enabled              ${libx264-no}"
 echo "XviD enabled              ${libxvid-no}"
 echo "zlib enabled              ${zlib-no}"
 echo "x264 enabled              ${libx264-no}"
 echo "XviD enabled              ${libxvid-no}"
 echo "zlib enabled              ${zlib-no}"

+echo

 
 

-for type in decoder encoder parser demuxer muxer protocol bsf indev outdev; do
+for type in decoder encoder parser demuxer muxer protocol filter bsf indev outdev; do

     echo "Enabled ${type}s:"
     echo "Enabled ${type}s:"

-    ucname="\$`toupper $type`_LIST"
-    list="`eval echo $ucname`"
-    partlist=""
+    eval list=\$$(toupper $type)_LIST

     for part in $list; do
     for part in $list; do

-        enabled $part && partlist="$partlist $part"
-    done
-    partlist=`echo $partlist | sed s/_$type//g | tr ' ' '\n' | sort`
-    echo $partlist
+        enabled $part && echo ${part%_*}
+    done | sort | pr -3 -t
+    echo

 done
 
 done
 

-enabled gpl &&
-    echo "License: GPL" ||
-    echo "License: LGPL"
+enabled nonfree &&
+    echo "License: unredistributable" ||
+    (enabled gpl &&
+        echo "License: GPL" ||
+        echo "License: LGPL")

 
 echo "Creating config.mak and config.h..."
 
 
 echo "Creating config.mak and config.h..."
 


@@ -1943,7 +1949,7 @@ echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH
 echo "#define FFMPEG_CONFIG_H" >> $TMPH
 echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
 
 echo "#define FFMPEG_CONFIG_H" >> $TMPH
 echo "#define FFMPEG_CONFIGURATION \"$FFMPEG_CONFIGURATION\"" >> $TMPH
 

-echo "PREFIX=$PREFIX" >> config.mak
+echo "PREFIX=$prefix" >> config.mak

 echo "prefix=\$(DESTDIR)\$(PREFIX)" >> config.mak
 echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak
 echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak
 echo "prefix=\$(DESTDIR)\$(PREFIX)" >> config.mak
 echo "LIBDIR=\$(DESTDIR)$libdir" >> config.mak
 echo "SHLIBDIR=\$(DESTDIR)$shlibdir" >> config.mak


@@ -1954,9 +1960,8 @@ echo "MAKE=$make" >> config.mak
 echo "CC=$cc" >> config.mak
 echo "AR=$ar" >> config.mak
 echo "RANLIB=$ranlib" >> config.mak
 echo "CC=$cc" >> config.mak
 echo "AR=$ar" >> config.mak
 echo "RANLIB=$ranlib" >> config.mak

-echo "LDCONFIG=$LDCONFIG" >> config.mak

 echo "LN_S=$ln_s" >> config.mak
 echo "LN_S=$ln_s" >> config.mak

-enabled dostrip &&
+enabled stripping &&

     echo "STRIP=$strip" >> config.mak ||
     echo "STRIP=echo ignoring strip" >> config.mak
 
     echo "STRIP=$strip" >> config.mak ||
     echo "STRIP=echo ignoring strip" >> config.mak
 


@@ -1969,7 +1974,7 @@ echo "VHOOKSHFLAGS=$VHOOKSHFLAGS" >> config.mak
 echo "VHOOKLIBS=$VHOOKLIBS" >> config.mak
 echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
 echo "BUILD_STATIC=$static" >> config.mak
 echo "VHOOKLIBS=$VHOOKLIBS" >> config.mak
 echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
 echo "BUILD_STATIC=$static" >> config.mak

-echo "BUILDSUF=$BUILDSUF" >> config.mak
+echo "BUILDSUF=$build_suffix" >> config.mak

 echo "FULLNAME=$FULLNAME" >> config.mak
 echo "LIBPREF=$LIBPREF" >> config.mak
 echo "LIBSUF=$LIBSUF" >> config.mak
 echo "FULLNAME=$FULLNAME" >> config.mak
 echo "LIBPREF=$LIBPREF" >> config.mak
 echo "LIBSUF=$LIBSUF" >> config.mak


@@ -1977,14 +1982,13 @@ echo "LIBNAME=$LIBNAME" >> config.mak
 echo "SLIBPREF=$SLIBPREF" >> config.mak
 echo "SLIBSUF=$SLIBSUF" >> config.mak
 echo "EXESUF=$EXESUF" >> config.mak
 echo "SLIBPREF=$SLIBPREF" >> config.mak
 echo "SLIBSUF=$SLIBSUF" >> config.mak
 echo "EXESUF=$EXESUF" >> config.mak

+echo "DEPEND_CMD=$DEPEND_CMD" >> config.mak
+echo "VHOOK_DEPEND_CMD=$VHOOK_DEPEND_CMD" >> config.mak

 
 if enabled bigendian; then
     echo "WORDS_BIGENDIAN=yes" >> config.mak
     echo "#define WORDS_BIGENDIAN 1" >> $TMPH
 fi
 
 if enabled bigendian; then
     echo "WORDS_BIGENDIAN=yes" >> config.mak
     echo "#define WORDS_BIGENDIAN 1" >> $TMPH
 fi

-if enabled mmx; then
-    echo "#define __CPU__ 586" >> $TMPH
-fi

 
 if enabled sdl; then
     echo "SDL_LIBS=`"${SDL_CONFIG}" --libs`" >> config.mak
 
 if enabled sdl; then
     echo "SDL_LIBS=`"${SDL_CONFIG}" --libs`" >> config.mak


@@ -1994,30 +1998,27 @@ if enabled texi2html; then
     echo "BUILD_DOC=yes" >> config.mak
 fi
 
     echo "BUILD_DOC=yes" >> config.mak
 fi
 

-sws_version=`grep '#define LIBSWSCALE_VERSION ' "$source_path/libswscale/swscale.h" | sed 's/[^0-9\.]//g'`
-pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
-lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
-lavd_version=`grep '#define LIBAVDEVICE_VERSION ' "$source_path/libavdevice/avdevice.h" | sed 's/[^0-9\.]//g'`
-lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
-lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`
-
+get_version(){
+    name=$1
+    file=$source_path/$2
+    eval $(grep "#define ${name}_VERSION_M" "$file" | awk '{ print $2"="$3 }')
+    eval ${name}_VERSION=\$${name}_VERSION_MAJOR.\$${name}_VERSION_MINOR.\$${name}_VERSION_MICRO
+    lcname=$(tolower $name)
+    eval echo "${lcname}_VERSION=\$${name}_VERSION" >> config.mak
+    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/avcodec.h
+get_version LIBAVDEVICE libavdevice/avdevice.h
+get_version LIBAVFORMAT libavformat/avformat.h
+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
 
 if enabled shared; then
     echo "BUILD_SHARED=yes" >> config.mak
     echo "PIC=-fPIC -DPIC" >> config.mak

-    echo "SPPMAJOR=${pp_version%%.*}" >> config.mak
-    echo "SPPVERSION=$pp_version" >> config.mak
-    echo "LAVCMAJOR=${lavc_version%%.*}" >> config.mak
-    echo "LAVCVERSION=$lavc_version" >> config.mak
-    echo "LAVDMAJOR=${lavd_version%%.*}" >> config.mak
-    echo "LAVDVERSION=$lavd_version" >> config.mak
-    echo "LAVFMAJOR=${lavf_version%%.*}" >> config.mak
-    echo "LAVFVERSION=$lavf_version" >> config.mak
-    echo "LAVUMAJOR=${lavu_version%%.*}" >> config.mak
-    echo "LAVUVERSION=$lavu_version" >> config.mak
-    echo "SWSMAJOR=${sws_version%%.*}" >> config.mak
-    echo "SWSVERSION=$sws_version" >> config.mak

     echo "SLIBNAME=${SLIBNAME}" >> config.mak
     echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
     echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
     echo "SLIBNAME=${SLIBNAME}" >> config.mak
     echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
     echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak


@@ -2038,6 +2039,7 @@ print_config CONFIG_ $TMPH config.mak $CONFIG_LIST       \
                                       $BSF_LIST          \
                                       $DEMUXER_LIST      \
                                       $MUXER_LIST        \
                                       $BSF_LIST          \
                                       $DEMUXER_LIST      \
                                       $MUXER_LIST        \

+                                      $FILTER_LIST       \

                                       $PROTOCOL_LIST     \
                                       $INDEV_LIST        \
                                       $OUTDEV_LIST       \
                                       $PROTOCOL_LIST     \
                                       $INDEV_LIST        \
                                       $OUTDEV_LIST       \


@@ -2057,15 +2059,16 @@ enabled asmalign_pot &&
     printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH ||
     printf '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\\n\\t"\n' >> $TMPH
 
     printf '#define ASMALIGN(ZEROBITS) ".align " #ZEROBITS "\\n\\t"\n' >> $TMPH ||
     printf '#define ASMALIGN(ZEROBITS) ".align 1<<" #ZEROBITS "\\n\\t"\n' >> $TMPH
 

+echo "#define EXTERN_PREFIX \"${extern_prefix}\"" >> $TMPH

 
 echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
 
 
 echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
 

-# Do not overwrite config.h if unchanged to avoid superfluous rebuilds.
+# Do not overwrite an unchanged config.h to avoid superfluous rebuilds.

 cmp -s $TMPH config.h &&
     echo "config.h is unchanged" ||
     mv -f $TMPH config.h
 
 cmp -s $TMPH config.h &&
     echo "config.h is unchanged" ||
     mv -f $TMPH config.h
 

-rm -f $TMPO $TMPC $TMPE $TMPS $TMPH
+rm -f $TMPC $TMPE $TMPH $TMPO $TMPS $TMPSH

 
 # build tree in object directory if source path is different from current one
 if enabled source_path_used; then
 
 # build tree in object directory if source path is different from current one
 if enabled source_path_used; then


@@ -2081,6 +2084,7 @@ if enabled source_path_used; then
         libavcodec/sh4    \
         libavcodec/sparc  \
         libavdevice       \
         libavcodec/sh4    \
         libavcodec/sparc  \
         libavdevice       \

+        libavfilter       \

         libavformat       \
         libavutil         \
         libpostproc       \
         libavformat       \
         libavutil         \
         libpostproc       \


@@ -2095,6 +2099,7 @@ if enabled source_path_used; then
         doc/texi2pod.pl      \
         libavcodec/Makefile  \
         libavdevice/Makefile \
         doc/texi2pod.pl      \
         libavcodec/Makefile  \
         libavdevice/Makefile \

+        libavfilter/Makefile \

         libavformat/Makefile \
         libavutil/Makefile   \
         libpostproc/Makefile \
         libavformat/Makefile \
         libavutil/Makefile   \
         libpostproc/Makefile \


@@ -2118,9 +2123,8 @@ comment=$2
 version=$3
 libs=$4
 requires=$5
 version=$3
 libs=$4
 requires=$5

-include=$6

 cat <<EOF >$name.pc
 cat <<EOF >$name.pc

-prefix=$PREFIX
+prefix=$prefix

 exec_prefix=\${prefix}
 libdir=\${exec_prefix}/lib
 includedir=\${prefix}/include
 exec_prefix=\${prefix}
 libdir=\${exec_prefix}/lib
 includedir=\${prefix}/include


@@ -2131,7 +2135,7 @@ Version: $version
 Requires: $requires
 Conflicts:
 Libs: -L\${libdir} $libs
 Requires: $requires
 Conflicts:
 Libs: -L\${libdir} $libs

-Cflags: -I\${includedir}/$include
+Cflags: -I\${includedir}

 EOF
 }
 
 EOF
 }
 


@@ -2146,7 +2150,7 @@ cat <<EOF >$name-uninstalled.pc
 prefix=
 exec_prefix=
 libdir=\${pcfiledir}/$name
 prefix=
 exec_prefix=
 libdir=\${pcfiledir}/$name

-includedir=\${pcfiledir}/$name
+includedir=\${pcfiledir}

 
 Name: $name
 Description: $comment
 
 Name: $name
 Description: $comment


@@ -2158,28 +2162,33 @@ Cflags: -I\${includedir}
 EOF
 }
 
 EOF
 }
 

-pkgconfig_generate libavutil "FFmpeg utility library" "$lavu_version" -lavutil "" ffmpeg
-pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$lavu_version"
+pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" -lavutil ""
+pkgconfig_generate_uninstalled libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"

 
 

-pkgconfig_generate libavcodec "FFmpeg codec library" "$lavc_version" "-lavcodec $extralibs" "$pkg_requires libavutil = $lavu_version" ffmpeg
-pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$lavc_version" "$extralibs" "$pkg_requires libavutil = $lavu_version"
+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "-lavcodec $extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
+pkgconfig_generate_uninstalled libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"

 
 

-pkgconfig_generate libavformat "FFmpeg container format library" "$lavf_version" "-lavformat $extralibs" "$pkg_requires libavcodec = $lavc_version" ffmpeg
-pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$lavf_version" "$extralibs" "$pkg_requires libavcodec = $lavc_version"
+pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "-lavformat $extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
+pkgconfig_generate_uninstalled libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"

 
 

-pkgconfig_generate libavdevice "FFmpeg device handling library" "$lavd_version" "-lavdevice $extralibs" "$pkg_requires libavformat = $lavf_version" ffmpeg
-pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$lavd_version" "$extralibs" "$pkg_requires libavformat = $lavf_version"
-if enabled pp; then
-    pkgconfig_generate libpostproc "FFmpeg post processing library" "$pp_version" -lpostproc "" postproc
-    pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$pp_version"
+pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "-lavdevice $extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION"
+pkgconfig_generate_uninstalled libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$pkg_requires libavformat = $LIBAVFORMAT_VERSION"
+if enabled postproc; then
+    pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" -lpostproc ""
+    pkgconfig_generate_uninstalled libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"

 fi
 
 fi
 

-if enabled swscaler; then
-    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" -lswscale "libavutil = $lavu_version" ffmpeg
-    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "libavutil = $lavu_version"
+if enabled swscale; then
+    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" -lswscale "libavutil = $LIBAVUTIL_VERSION"
+    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"

 else
 else

-    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version" ffmpeg
-    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$sws_version" "" "$pkg_requires libavcodec = $lavc_version"
+    pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"
+    pkgconfig_generate_uninstalled libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "$pkg_requires libavcodec = $LIBAVCODEC_VERSION"

     apply libswscale.pc sed s/^Libs:.*$/Libs:/
     apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
 fi
     apply libswscale.pc sed s/^Libs:.*$/Libs:/
     apply libswscale-uninstalled.pc sed s/^Libs:.*$/Libs:/
 fi

+
+if enabled avfilter; then
+  pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "-lavfilter $extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION" ffmpeg
+  pkgconfig_generate_uninstalled libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$pkg_requires libavutil = $LIBAVUTIL_VERSION"
+fi