diff options
42 files changed, 261 insertions, 340 deletions
@@ -97,6 +97,7 @@ MPlayer (1.0) * Direct3D Windows video output driver added. * factorize code in vo_wii * removed unnecessary code from vo x11, xv, xvmc + * automatic detection of hw acceleration (vo gl:yuv=x) for vo_gl MEncoder: * check for system-wide configuration file in MEncoder diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 785c4f8cf8..384445b3c1 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -9100,6 +9100,10 @@ Currently it only works if scene change detection is disabled (sc_threshold=1000000000). . .TP +.B "gmc\ \ \ \ " +Enable Global Motion Compensation. +. +.TP .B (no)lowdelay Sets the low delay flag for MPEG-1/2 (disables B-frames). . diff --git a/DOCS/man/zh/mplayer.1 b/DOCS/man/zh_CN/mplayer.1 index a18f1f1ba0..a18f1f1ba0 100644 --- a/DOCS/man/zh/mplayer.1 +++ b/DOCS/man/zh_CN/mplayer.1 diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index fae3bd8618..257ca635c3 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -26,13 +26,21 @@ answers. <itemizedlist> <listitem><para> - <emphasis role="bold">binutils</emphasis> - recommended version is - <emphasis role="bold">2.11.x</emphasis>. + <emphasis role="bold">POSIX system</emphasis> - You need a POSIX-compatible + shell and POSIX-compatible system tools like grep, sed, awk, etc. in your + path. </para></listitem> <listitem><para> - <emphasis role="bold">gcc</emphasis> - recommended versions are 2.95 - and 3.4+. 2.96 and 3.0.x are known to generate faulty code, 3.1 and - 3.2 also had problems, 3.3 some minor ones. On PowerPC, use 4.x. + <emphasis role="bold">GNU make</emphasis> 3.81 or later +</para></listitem> +<listitem><para> + <emphasis role="bold">binutils</emphasis> - GNU binutils 2.11 or later + is known to work. +</para></listitem> +<listitem><para> + <emphasis role="bold">compiler</emphasis> - We mostly use gcc, the + recommended versions on x86 are 2.95 and 3.4+. On PowerPC, use 4.x+. + icc 10.1+ is also known to work. </para></listitem> <listitem><para> <emphasis role="bold">Xorg/XFree86</emphasis> - recommended version is @@ -42,9 +50,6 @@ answers. You don't absolutely need X, some video output drivers work without it. </para></listitem> <listitem><para> - <emphasis role="bold">GNU make</emphasis> 3.81 -</para></listitem> -<listitem><para> <emphasis role="bold">FreeType</emphasis> - 2.0.9 or later is required for the OSD and subtitles </para></listitem> diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml index 29ed6bd422..abf5c17f72 100644 --- a/DOCS/xml/en/ports.xml +++ b/DOCS/xml/en/ports.xml @@ -3,18 +3,18 @@ <chapter id="ports" xreflabel="Ports"> <title>Ports</title> -<sect1 id="linux"> -<title>Linux</title> - <para> -The main development platform is Linux on x86, although -<application>MPlayer</application> works on many other Linux ports. Binary packages of <application>MPlayer</application> are available from several -sources. +sources. We have a list of places to get +<ulink url="http://www.mplayerhq.hu/design7/projects.html#unofficial_packages">unofficial packages</ulink> +for various systems on our homepage. However, <emphasis role="bold">none of these packages are supported</emphasis>. Report problems to the authors, not to us. </para> +<sect1 id="linux"> +<title>Linux</title> + <!-- ********** --> <sect2 id="debian"> @@ -45,13 +45,6 @@ As root you can then install the <filename>.deb</filename> package as usual: <screen>dpkg -i ../mplayer_<replaceable>version</replaceable>.deb</screen> </para> - -<para> -Christian Marillat has been making unofficial Debian packages of -<application>MPlayer</application>, <application>MEncoder</application> and -our binary codec packages for a while, you can (apt-)get them from -<ulink url="http://www.debian-multimedia.org/">his homepage</ulink>. -</para> </sect2> <!-- ********** --> @@ -60,25 +53,17 @@ our binary codec packages for a while, you can (apt-)get them from <title>RPM packaging</title> <para> -Dominik Mierzejewski maintains the official RPM packages of -<application>MPlayer</application> for Fedora and CentOS/RHEL. They are available -from <ulink url="http://rpmfusion.org/">RPMFusion repository</ulink>. -</para> +To build an RPM package, run the following command in the +<application>MPlayer</application> source directory: -<para> -Mandrake/Mandriva RPM packages are available from the -<ulink url="http://plf.zarb.org/">P.L.F.</ulink>. -SUSE used to include a crippled version of <application>MPlayer</application> -in their distribution. They have removed it in their latest releases. You can -get working RPMs from -<ulink url="http://packman.links2linux.de/?action=128">links2linux.de</ulink>. +<screen>FIXME: insert proper commands here</screen> </para> </sect2> <!-- ********** --> -<sect2 id="arm"> -<title>ARM</title> +<sect2 id="arm_linux"> +<title>ARM Linux</title> <para> <application>MPlayer</application> works on Linux PDAs with ARM CPU e.g. Sharp @@ -110,11 +95,6 @@ available that are probably easier to use than our raw sources. </para> <para> -To build <application>MPlayer</application> you will need GNU make -(gmake - native BSD make will not work) and a recent version of binutils. -</para> - -<para> If <application>MPlayer</application> complains about not finding <filename>/dev/cdrom</filename> or <filename>/dev/dvd</filename>, create an appropriate symbolic link: @@ -188,6 +168,13 @@ adjustments to make the build work. <title>Solaris</title> <para> +Solaris still has broken, POSIX-incompatible system tools and shell in default +locations. Until a bold step out of the computing stone age is made, you will +have to add <filename>/usr/xpg4/bin</filename> to your +<systemitem>PATH</systemitem>. +</para> + +<para> <application>MPlayer</application> should work on Solaris 2.6 or newer. Use the SUN audio driver with the <option>-ao sun</option> option for sound. </para> @@ -223,17 +210,6 @@ installed. </itemizedlist> <para> -To build the package you will need GNU <application>make</application> -(<filename>gmake</filename>, <filename>/opt/sfw/gmake</filename>), native -Solaris make will not work. Typical error you get when building with -Solaris' make instead of GNU make: -<screen> -% /usr/ccs/bin/make -make: Fatal error in reader: Makefile, line 25: Unexpected end of line seen -</screen> -</para> - -<para> On Solaris SPARC, you need the GNU C/C++ Compiler; it does not matter if GNU C/C++ compiler is configured with or without the GNU assembler. </para> @@ -339,34 +315,6 @@ you may not be able to play DVD discs larger than 4 GB: <!-- ********** --> -<sect2 id="irix"> -<title>IRIX</title> - -<para> -You can either try to install the GNU install program, and (if you did -not put it in your global path) then point to the location with: -<screen> -./configure --with-install=<replaceable>/path/and/name/of/install</replaceable> -</screen> -</para> - -<para> -Or you can use the default install delivered with IRIX 6.5 in which case -you will have to edit the <filename>Makefile</filename> by hand a little bit. -Change the line: -<programlisting> -$(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1 -</programlisting> -to: -<programlisting> -$(INSTALL) -m 644 mplayer.1 $(MANDIR)/man1/ -</programlisting> -and then go on with building and installing. -</para> -</sect2> - -<!-- ********** --> - <sect2 id="hp-ux"> <title>HP-UX</title> @@ -378,7 +326,7 @@ work out of the box. The following information is taken from this HOWTO. </para> <para> -You need GCC 3.4.0 or later, GNU make 3.80 or later and SDL 1.2.7 or later. +You need GCC 3.4.0 or later and SDL 1.2.7 or later. HP cc will not produce a working program, prior GCC versions are buggy. For OpenGL functionality you need to install Mesa and the gl and gl2 video output drivers should work, speed may be very bad, depending on the CPU speed, @@ -490,13 +438,6 @@ or if you are building on POWER5, GCC 4.0 is required. </para> <para> -Ensure that you are using GNU make -(<filename>/opt/freeware/bin/gmake</filename>) to build -<application>MPlayer</application>, as you will encounter problems if -you use <filename>/usr/ccs/bin/make</filename>. -</para> - -<para> CPU detection is still a work in progress. The following architectures have been tested: </para> @@ -549,6 +490,23 @@ Messages in the GTK-2 interface will be broken then.<!-- </listitem> </itemizedlist> </sect2> + +<!-- ********** --> + +<sect2 id="qnx"> +<title>QNX</title> + +<para> +You'll need to download and install SDL for QNX. Then run +<application>MPlayer</application> with <option>-vo sdl:driver=photon</option> +and <option>-ao sdl:nto</option> options, it should be fast. +</para> + +<para> +The <option>-vo x11</option> output will be even slower than on Linux, +since QNX has only X <emphasis>emulation</emphasis> which is very slow. +</para> +</sect2> </sect1> @@ -695,11 +653,9 @@ Instructions and files for making SDL run under <title><application>MinGW</application></title> <para> -Installing a version of <application>MinGW</application> that could -compile <application>MPlayer</application> used to be quite tricky, but it -works out of the box now. Just install <application>MinGW</application> -3.1.0 or later and MSYS 1.0.9 or later and tell the MSYS postinstall that -<application>MinGW</application> is installed. +You need <application>MinGW</application> 3.1.0 or later and MSYS 1.0.9 or +later. Tell the MSYS postinstall that <application>MinGW</application> is +installed. </para> <para> @@ -882,71 +838,4 @@ not work anymore. </sect2> </sect1> - -<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> - - -<sect1 id="exotic_platforms"> -<title>Exotic Platforms</title> - -<para> -<application>MPlayer</application> runs on a number of exotic platforms, -but most of the platform-specific changes from those systems have not been -merged back into the main source tree. -For build instructions you should refer to the system-specific documentation. -</para> - -<!-- ********** --> - -<sect2 id="qnx"> -<title>QNX</title> - -<para> -You'll need to download and install SDL for QNX. Then run -<application>MPlayer</application> with <option>-vo sdl:driver=photon</option> -and <option>-ao sdl:nto</option> options, it should be fast. -</para> - -<para> -The <option>-vo x11</option> output will be even slower than on Linux, -since QNX has only X <emphasis>emulation</emphasis> which is very slow. -</para> -</sect2> - -<!-- ********** --> - -<sect2 id="amiga"> -<title>Amiga/MorphOS (GeekGadgets)</title> -<para> -The people over at -<ulink url="http://www.amigasoft.net">www.amigasoft.net</ulink> -make current <application>MPlayer</application> and -<application>MEncoder</application> packages. -</para> - -<para> -Nicholas Det at Genesi has done a big and powerful port of <application>MPlayer -</application> for MorphOS. Sadly it's based on the 0.90 series. -</para> - -<para> -Get if from <ulink url="http://www.morphzone.org/">MorphZone</ulink>: -<itemizedlist> -<listitem><para> - <ulink url="http://www.morphzone.org/modules/mydownloads/singlefile.php?lid=90"> - <application>MPlayer</application> 0.91 binary</ulink> -</para></listitem> -<listitem><para> - <ulink url="http://www.morphzone.org/modules/mydownloads/singlefile.php?lid=91"> - <application>MPlayer</application> 0.91 source</ulink> -</para></listitem> -<listitem><para> - <ulink url="http://www.morphzone.org/modules/mydownloads/singlefile.php?lid=92"> - <application>MEncoder</application> 1.0pre3 binary</ulink> -</para></listitem> -</itemizedlist> -</para> -</sect2> -</sect1> - </chapter> @@ -873,8 +873,8 @@ vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER) VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ vidix/pci_names.h vidix/pci_vendors.h -$(VIDIX_PCI_FILES): vidix/pci.db vidix/pci_db2c.awk - awk -f vidix/pci_db2c.awk $< $(VIDIX_PCIDB) +$(VIDIX_PCI_FILES): vidix/pci_db2c.awk vidix/pci.db + awk -f $^ $(VIDIX_PCIDB) VIDIX_DEPS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.d)) VIDIX_OBJS = $(filter vidix/%,$(SRCS_MPLAYER:.c=.o)) @@ -909,7 +909,7 @@ install-mencoder-man-en: install-mplayer-man-en install-mplayer-man-en: if test ! -d $(MANDIR)/man1 ; then $(INSTALL) -d $(MANDIR)/man1 ; fi - $(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ + $(INSTALL) -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ define MENCODER_MAN_RULE install-mencoder-man-$(lang): install-mplayer-man-$(lang) @@ -919,7 +919,7 @@ endef define MPLAYER_MAN_RULE install-mplayer-man-$(lang): if test ! -d $(MANDIR)/$(lang)/man1 ; then $(INSTALL) -d $(MANDIR)/$(lang)/man1 ; fi - $(INSTALL) -c -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/ + $(INSTALL) -m 644 DOCS/man/$(lang)/mplayer.1 $(MANDIR)/$(lang)/man1/ endef $(foreach lang,$(filter-out en,$(MAN_LANG_ALL)),$(eval $(MENCODER_MAN_RULE))) @@ -16,6 +16,8 @@ Also read the man page to learn how to use MPlayer. Requirements: +- POSIX system: You need a POSIX-compatible shell and POSIX-compatible system + tools like grep, sed, awk, etc. in your path. - You need a working development environment that can compile programs. On popular Linux distributions, this means having the glibc development package(s) installed. diff --git a/TOOLS/netstream.c b/TOOLS/netstream.c index 8bc09b9a9d..300b1d3f80 100644 --- a/TOOLS/netstream.c +++ b/TOOLS/netstream.c @@ -28,7 +28,7 @@ #include "config.h" -#ifndef HAVE_WINSOCK2_H +#if !HAVE_WINSOCK2_H #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -197,7 +197,7 @@ case `echo -n` in esac msg_lang_all=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"` -man_lang_all=`echo DOCS/man/??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g"` +man_lang_all=`echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -e "s:DOCS/man/\(.._..\)/mplayer.1:\1:g"` doc_lang_all=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"` show_help(){ @@ -1690,6 +1690,7 @@ EOF fi +def_fast_64bit='#define HAVE_FAST_64BIT 0' _arch_all='X86 X86_32 X86_64 IA64 SPARC ARM SH4 PPC ALPHA SGI_MIPS PA_RISC S390 S390X VAX BFIN XTENSA GENERIC' case "$host_arch" in i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686) @@ -2057,7 +2058,7 @@ EOF ppc|ppc64|powerpc|powerpc64) _arch='PPC' - _def_dcbzl='#undef HAVE_DCBZL' + _def_dcbzl='#define HAVE_DCBZL 0' _target_arch='ARCH_PPC = yes' _def_fast_unaligned='#define HAVE_FAST_UNALIGNED 1' iproc='ppc' @@ -2501,10 +2502,17 @@ else _have_yasm="no" echores "no" fi + +echocheck "bswap" +def_bswap='#define HAVE_BSWAP 0' +echo 'bswap %eax' > $TMPS +$_as $TMPS -o $TMPEXE > /dev/null 2>&1 && def_bswap='#define HAVE_BSWAP 1' && bswap=yes || bswap=no +echores "$bswap" fi #if x86 #FIXME: This should happen before the check for CFLAGS.. +def_altivec_h='#define HAVE_ALTIVEC_H 0' if ppc && ( test "$_altivec" = yes || test "$_runtime_cpudetection" = yes ) ; then # check if AltiVec is supported by the compiler, and how to enable it @@ -2515,7 +2523,6 @@ EOF if $(cc_check -maltivec -mabi=altivec) ; then _altivec_gcc_flags="-maltivec -mabi=altivec" # check if <altivec.h> should be included - def_altivec_h='#undef HAVE_ALTIVEC_H' cat > $TMPC << EOF #include <altivec.h> int main(void) { return 0; } @@ -2617,7 +2624,7 @@ EOF echores "$_iwmmxt" fi -_cpuexts_all='ALTIVEC BSWAP MMX MMX2 AMD3DNOW AMD3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MMI VIS MVI' +_cpuexts_all='ALTIVEC MMX MMX2 AMD3DNOW AMD3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MMI VIS MVI' test "$_altivec" = yes && _cpuexts="ALTIVEC $_cpuexts" test "$_mmx" = yes && _cpuexts="MMX $_cpuexts" test "$_mmxext" = yes && _cpuexts="MMX2 $_cpuexts" @@ -2636,9 +2643,6 @@ test "$_armvfp" = yes && _cpuexts="ARMVFP $_cpuexts" test "$_iwmmxt" = yes && _cpuexts="IWMMXT $_cpuexts" test "$_vis" = yes && _cpuexts="VIS $_cpuexts" test "$_mvi" = yes && _cpuexts="MVI $_cpuexts" -if x86 ; then - _cpuexts="BSWAP $_cpuexts" -fi # Checking kernel version... if x86_32 && linux ; then @@ -2848,7 +2852,7 @@ if eval test "x\$_$func" = "xyes"; then eval _def_$func="\"#define HAVE_`echo $func | tr '[a-z]' '[A-Z]'` 1\"" echores yes else - eval _def_$func="\"#undef HAVE_`echo $func | tr '[a-z]' '[A-Z]'`\"" + eval _def_$func="\"#define HAVE_`echo $func | tr '[a-z]' '[A-Z]'` 0\"" echores no fi done @@ -2913,63 +2917,46 @@ if test $_winsock2_h = yes ; then _ld_sock="-lws2_32" def_winsock2_h='#define HAVE_WINSOCK2_H 1' else - def_winsock2_h='#undef HAVE_WINSOCK2_H' + def_winsock2_h='#define HAVE_WINSOCK2_H 0' fi -_use_aton=no echocheck "inet_pton()" +def_inet_pton='#define HAVE_INET_PTON 0' +inet_pton=no cat > $TMPC << EOF #include <sys/types.h> #include <sys/socket.h> #include <arpa/inet.h> int main(void) { (void) inet_pton(0, 0, 0); return 0; } EOF -if test "$_winsock2_h" = yes ; then - _res_comment="using winsock2 functions instead" - echores "no" -elif cc_check $_ld_sock ; then - # NOTE: Linux has libresolv but does not need it - : - test $_ld_sock && _res_comment="using $_ld_sock" - echores "yes" -elif cc_check $_ld_sock -lresolv ; then - # NOTE: needed for SunOS at least - _ld_sock="$_ld_sock -lresolv" - _res_comment="using $_ld_sock" - echores "yes" -else - _res_comment="trying inet_aton next" - echores "no" +for _ld_tmp in "$_ld_sock" "$_ld_sock -lresolv" ; do + cc_check $_ld_tmp && inet_pton=yes && break +done +if test $inet_pton = yes ; then + test $_ld_tmp && _res_comment="using $_ld_tmp" + def_inet_pton='#define HAVE_INET_PTON 1' +fi +echores "$inet_pton" - echocheck "inet_aton()" - cat > $TMPC << EOF + +echocheck "inet_aton()" +def_inet_aton='#define HAVE_INET_ATON 0' +inet_aton=no +cat > $TMPC << EOF #include <sys/types.h> #include <sys/socket.h> #include <arpa/inet.h> int main(void) { (void) inet_aton(0, 0); return 0; } EOF - _use_aton=yes - if cc_check $_ld_sock ; then - # NOTE: Linux has libresolv but does not need it - : - test $_ld_sock && _res_comment="using $_ld_sock" - elif cc_check $_ld_sock -lresolv ; then - # NOTE: needed for SunOS at least - _ld_sock="$_ld_sock -lresolv" - _res_comment="using $_ld_sock" - else - _use_aton=no - _network=no - _res_comment="network support disabled" - fi - echores "$_use_aton" -fi - -_def_use_aton='#undef HAVE_ATON' -if test "$_use_aton" = yes; then - _def_use_aton='#define HAVE_ATON 1' +for _ld_tmp in "$_ld_sock" "$_ld_sock -lresolv" ; do + cc_check $_ld_tmp && inet_aton=yes && break +done +if test $inet_aton = yes ; then + test $_ld_tmp && _res_comment="using $_ld_tmp" + def_inet_aton='#define HAVE_INET_ATON 1' fi +echores "$inet_aton" echocheck "socklen_t" @@ -2984,7 +2971,7 @@ done if test "$_socklen_t" = yes ; then _def_socklen_t='#define HAVE_SOCKLEN_T 1' else - _def_socklen_t='#undef HAVE_SOCKLEN_T' + _def_socklen_t='#define HAVE_SOCKLEN_T 0' fi echores "$_socklen_t" @@ -2999,13 +2986,14 @@ cc_check $_ld_sock && _closesocket=yes if test "$_closesocket" = yes ; then _def_closesocket='#define HAVE_CLOSESOCKET 1' else - _def_closesocket='#undef HAVE_CLOSESOCKET' + _def_closesocket='#define HAVE_CLOSESOCKET 0' fi echores "$_closesocket" echocheck "network" -# FIXME network check +test $_winsock2_h = no && test $inet_pton = no && + test $inet_aton = no && _network=no if test "$_network" = yes ; then _def_network='#define CONFIG_NETWORK 1' _ld_extra="$_ld_extra $_ld_sock" @@ -3130,6 +3118,7 @@ echores "$_malloc" echocheck "memalign()" # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ? +_def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' cat > $TMPC << EOF #include <malloc.h> int main(void) { (void) memalign(64, sizeof(char)); return 0; } @@ -3581,6 +3570,7 @@ echores "$_vsscanf" echocheck "swab()" cat > $TMPC << EOF +#define _XOPEN_SOURCE #include <unistd.h> int main(void) { swab(0, 0, 0); return 0; } EOF @@ -6368,7 +6358,7 @@ if test "$_faac" = yes ; then else _faac_lavc=no _def_faac="#undef CONFIG_FAAC" - _def_faac_lavc="#undef CONFIG_LIBFAAC" + _def_faac_lavc="#define CONFIG_LIBFAAC 0" _nocodecmodules="faac $_nocodecmodules" fi _res_comment="in libavcodec: $_faac_lavc" @@ -6927,7 +6917,7 @@ if test "$_xvid_lavc" = yes ; then _libavencoders="$_libavencoders LIBXVID_ENCODER" else _xvid_lavc=no - _def_xvid_lavc='#undef CONFIG_LIBXVID' + _def_xvid_lavc='#define CONFIG_LIBXVID 0' fi echores "$_xvid_lavc" @@ -6960,7 +6950,7 @@ if test "$_x264" = yes ; then else _x264_lavc=no _def_x264='#undef CONFIG_X264' - _def_x264_lavc='#undef CONFIG_LIBX264' + _def_x264_lavc='#define CONFIG_LIBX264 0' _nocodecmodules="x264 $_nocodecmodules" fi _res_comment="in libavcodec: $_x264_lavc" @@ -7003,7 +6993,7 @@ if test "$_libdirac_lavc" = yes ; then _libavdecoders="$_libavdecoders LIBDIRAC_DECODER" _codecmodules="libdirac $_codecmodules" else - _def_libdirac_lavc='#undef CONFIG_LIBDIRAC' + _def_libdirac_lavc='#define CONFIG_LIBDIRAC 0' _nocodecmodules="libdirac $_nocodecmodules" fi echores "$_libdirac_lavc" @@ -7035,7 +7025,7 @@ if test "$_libschroedinger_lavc" = yes ; then _libavdecoders="$_libavdecoders LIBSCHROEDINGER_DECODER" _codecmodules="libschroedinger $_codecmodules" else - _def_libschroedinger_lavc='#undef CONFIG_LIBSCHROEDINGER' + _def_libschroedinger_lavc='#define CONFIG_LIBSCHROEDINGER 0' _nocodecmodules="libschroedinger $_nocodecmodules" fi echores "$_libschroedinger_lavc" @@ -7126,7 +7116,7 @@ EOF else _mp3lame_lavc=no _def_mp3lame='#undef CONFIG_MP3LAME' - _def_mp3lame_lavc="#undef CONFIG_LIBMP3LAME" + _def_mp3lame_lavc="#define CONFIG_LIBMP3LAME 0" fi _res_comment="in libavcodec: $_mp3lame_lavc" echores "$_mp3lame" @@ -8278,7 +8268,7 @@ $_def_fast_inttypes #define HAVE_SYS_STAT_H 1 #define HAVE_SYS_TYPES_H 1 /* libdvdread */ -#define HAVE_UINTPTR_T 1 +#define HAVE_DLFCN_H 1 /* system headers */ @@ -8307,7 +8297,6 @@ $_def_lrint $_def_lrintf $_def_map_memalign $_def_memalign -$_def_memalign_hack $_def_nanosleep $_def_posix_select $_def_round @@ -8494,12 +8483,13 @@ $_def_fribidi $_def_closesocket $_def_ftp $_def_inet6 +$def_inet_aton +$def_inet_pton $_def_live $_def_nemesi $_def_network $_def_smb $_def_socklen_t -$_def_use_aton $_def_vstream @@ -8595,20 +8585,36 @@ $_def_libswscale $_def_libswscale_a $_def_libswscale_so +$def_bswap $_def_dcbzl $def_fast_64bit $_def_fast_unaligned +$_def_memalign_hack $def_mlib $_def_mkstemp $_def_pthreads $_def_threads $_def_yasm +#define CONFIG_FASTDIV 0 +#define CONFIG_FFSERVER 0 #define CONFIG_GPL 1 +#define CONFIG_HARDCODED_TA |