October 2005 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main mplayer.c,1.878,1.879
by syncmail＠mplayerhq.hu 18 Oct '05

18 Oct '05

CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv27855 Modified Files: mplayer.c Log Message: new message was even worse -- B/s means bytes per second, not sample! Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.878 retrieving revision 1.879 diff -u -r1.878 -r1.879 --- mplayer.c 16 Oct 2005 19:14:08 -0000 1.878 +++ mplayer.c 17 Oct 2005 18:16:28 -0000 1.879 @@ -2241,7 +2241,7 @@ } else { // SUCCESS: inited_flags|=INITED_AO; - mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d B/s)\n", + mp_msg(MSGT_CPLAYER,MSGL_INFO,"AO: [%s] %dHz %dch %s (%d bytes per sample)\n", audio_out->info->short_name, ao_data.samplerate, ao_data.channels, af_fmt2str_short(ao_data.format),

3 2

CVS: main configure,1.1087,1.1088
by syncmail＠mplayerhq.hu 18 Oct '05

18 Oct '05

CVS change done by Aurelien Jacobs CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv719 Modified Files: configure Log Message: add cross-compiling support Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1087 retrieving revision 1.1088 diff -u -r1.1087 -r1.1088 --- configure 18 Oct 2005 21:44:14 -0000 1.1087 +++ configure 18 Oct 2005 21:48:09 -0000 1.1088 @@ -317,6 +317,7 @@ Miscellaneous options: --enable-runtime-cpudetection Enable runtime CPU detection [disable] + --enable-cross-compile Enable cross-compilation [autodetect] --cc=COMPILER use this C compiler to build MPlayer [gcc] --host-cc=COMPILER use this C compiler to build apps needed for the build process [gcc] --as=ASSEMBLER use this assembler to build MPlayer [as] @@ -414,6 +415,7 @@ test "$CC" && _cc="$CC" _as=auto _runtime_cpudetection=no +_cross_compile=auto for ac_option do case "$ac_option" in --target=*) @@ -455,6 +457,12 @@ --disable-runtime-cpudetection) _runtime_cpudetection=no ;; + --enable-cross-compile) + _cross_compile=yes + ;; + --disable-cross-compile) + _cross_compile=no + ;; --install-path=*) _install=`echo $ac_option | cut -d '=' -f 2 | sed 's/\/$//'`"/install" ;; @@ -714,6 +722,21 @@ test "$_host_cc" || _host_cc=$_cc echores $_host_cc +echocheck "cross compilation" +if test $_cross_compile = auto ; then + cat > $TMPC << EOF +int main() { return 0; } +EOF + _cross_compile=yes + cc_check && "$TMPO" && _cross_compile=no +fi +echores $_cross_compile + +if test $_cross_compile = yes; then + tmp_run() { + return 0 + } +fi # --- @@ -1541,6 +1564,8 @@ --with-extralibdir=*) ;; --enable-runtime-cpudetection) ;; --disable-runtime-cpudetection) ;; + --enable-cross-compile) ;; + --disable-cross-compile) ;; --install-path=*) ;; --with-install=*) ;;

1 0

CVS: main configure,1.1086,1.1087
by syncmail＠mplayerhq.hu 18 Oct '05

18 Oct '05

CVS change done by Aurelien Jacobs CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv14398 Modified Files: configure Log Message: replace all the direct $TMPO calls by a tmp_run() function call Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1086 retrieving revision 1.1087 diff -u -r1.1086 -r1.1087 --- configure 18 Oct 2005 21:40:16 -0000 1.1086 +++ configure 18 Oct 2005 21:44:14 -0000 1.1087 @@ -53,6 +53,10 @@ compile_check $TMPCPP $@ -lstdc++ } +tmp_run() { + "$TMPO" >> "$TMPLOG" 2>&1 +} + # Display error message, flushes tempfile, exit die () { echo @@ -1331,7 +1335,7 @@ } EOF - if ( cc_check && $TMPO ) > /dev/null 2>&1 ; then + if cc_check && tmp_run ; then echores "yes" _optimizing="$_optimizing $2" return 0 @@ -2780,7 +2784,7 @@ if not hpux ; then for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do # for crosscompilation, we cannot execute the program, be happy if we can link statically - cc_check $_ld_tmp && ($TMPO || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break + cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break done fi fi @@ -4094,7 +4098,7 @@ } EOF if cc_check -lpng -lz $_ld_lm ; then - if "$TMPO" >> "$TMPLOG" ; then + if tmp_run ; then _png=yes else _res_comment="mismatch of library and header versions" @@ -4129,7 +4133,7 @@ } EOF if cc_check -ljpeg $_ld_lm ; then - if "$TMPO" >> "$TMPLOG" ; then + if tmp_run ; then _jpg=yes fi fi @@ -4194,7 +4198,7 @@ } EOF for _ld_tmp in "-lungif" "-lungif $_ld_x11" "-lgif" "-lgif $_ld_x11" ; do - cc_check $_ld_tmp && "$TMPO" >> "$TMPLOG" && _ld_gif="$_ld_tmp" && _gif=yes && break + cc_check $_ld_tmp && tmp_run && _ld_gif="$_ld_tmp" && _gif=yes && break done fi @@ -4232,7 +4236,7 @@ return 0; } EOF - if cc_check "$_ld_gif" && ( "$TMPO" ) >>"$TMPLOG" 2>&1 ; then + if cc_check "$_ld_gif" && tmp_run ; then _def_gif_4='#define HAVE_GIF_4 1' _gif="yes" fi @@ -4258,7 +4262,7 @@ return 0; } EOF - if cc_check "$_ld_gif" && "$TMPO" >>"$TMPLOG" 2>&1 ; then + if cc_check "$_ld_gif" && tmp_run ; then _def_gif_tvt_hack='#undef HAVE_GIF_TVT_HACK' echores "disabled" else @@ -4572,7 +4576,7 @@ #include <artsc.h> int main(void) { return 0; } EOF -cc_check `artsc-config --libs` `artsc-config --cflags` && ( "$TMPO" >> "$TMPLOG" 2>&1 ) && _arts=yes +cc_check `artsc-config --libs` `artsc-config --cflags` && tmp_run && _arts=yes fi fi @@ -4598,7 +4602,7 @@ #include <esd.h> int main(void) { return 0; } EOF -cc_check `esd-config --libs` `esd-config --cflags` && "$TMPO" >> "$TMPLOG" 2>&1 && _esd=yes +cc_check `esd-config --libs` `esd-config --cflags` && tmp_run && _esd=yes fi fi @@ -4635,7 +4639,7 @@ #include <polyp/polyplib-error.h> int main(void) { return 0; } EOF -cc_check `pkg-config --libs --cflags polyplib polyplib-error polyplib-mainloop` && "$TMPO" >> "$TMPLOG" 2>&1 && _polyp=yes +cc_check `pkg-config --libs --cflags polyplib polyplib-error polyplib-mainloop` && tmp_run && _polyp=yes fi fi @@ -5054,7 +5058,7 @@ } EOF _freetype=no - cc_check `$_freetypeconfig --cflags` `$_freetypeconfig --libs` && $TMPO >> "$TMPLOG" && _freetype=yes + cc_check `$_freetypeconfig --cflags` `$_freetypeconfig --libs` && tmp_run && _freetype=yes else _freetype=no fi @@ -5123,7 +5127,7 @@ } EOF _fribidi=no - cc_check `$_fribidiconfig --cflags` `$_fribidiconfig --libs` && $TMPO >> "$TMPLOG" && _fribidi=yes + cc_check `$_fribidiconfig --cflags` `$_fribidiconfig --libs` && tmp_run && _fribidi=yes else _fribidi=no fi @@ -5641,7 +5645,7 @@ int myclass::myreturn(void) { ret = 0; return ret ; } int main(void) { myclass myobject; return myobject.myreturn(); } EOF - if cxx_check && "$TMPO" >> "$TMPLOG" 2>&1 ; then + if cxx_check && tmp_run ; then _dshow=yes echores "yes (C++ is ok)" else @@ -6188,7 +6192,7 @@ int main(void) { lame_version_t lv; (void) lame_init(); get_lame_version_numerical(&lv); printf("%d%d\n",lv.major,lv.minor); return 0; } EOF # Note: libmp3lame usually depends on vorbis - cc_check -lmp3lame $_ld_vorbis $_ld_lm && "$TMPO" >> "$TMPLOG" 2>&1 && _mp3lame=yes + cc_check -lmp3lame $_ld_vorbis $_ld_lm && tmp_run && _mp3lame=yes if test "$_mp3lame" = yes ; then _def_mp3lame="#define HAVE_MP3LAME" _ld_mp3lame="-lmp3lame $_ld_vorbis"

1 0

CVS: main/libmpcodecs ae_lame.c,1.3,1.4
by syncmail＠mplayerhq.hu 18 Oct '05

18 Oct '05

CVS change done by Aurelien Jacobs CVS Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var2/tmp/cvs-serv2683/libmpcodecs Modified Files: ae_lame.c Log Message: replace mp3lame version detection by required features detection Index: ae_lame.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ae_lame.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ae_lame.c 22 Apr 2005 17:53:31 -0000 1.3 +++ ae_lame.c 18 Oct 2005 21:40:17 -0000 1.4 @@ -32,7 +32,7 @@ static int lame_param_br_min = 0; //not specified static int lame_param_br_max = 0; //not specified -#if HAVE_MP3LAME >= 392 +#ifdef HAVE_MP3LAME_PRESET int lame_param_fast=0; // unset static char* lame_param_preset=NULL; // unset static int lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name ); @@ -57,7 +57,7 @@ {"free", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"br_min", &lame_param_br_min, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, {"br_max", &lame_param_br_max, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, -#if HAVE_MP3LAME >= 392 +#ifdef HAVE_MP3LAME_PRESET {"fast", &lame_param_fast, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"preset", &lame_param_preset, CONF_TYPE_STRING, 0, 0, 0, NULL}, #else @@ -181,7 +181,7 @@ } if(lame_param_lowpassfreq>=-1) lame_set_lowpassfreq(lame,lame_param_lowpassfreq); if(lame_param_highpassfreq>=-1) lame_set_highpassfreq(lame,lame_param_highpassfreq); -#if HAVE_MP3LAME >= 392 +#ifdef HAVE_MP3LAME_PRESET if(lame_param_preset != NULL) { mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_LamePresetEquals,lame_param_preset); if(lame_presets_set(lame,lame_param_fast, (lame_param_vbr==0), lame_param_preset) < 0) @@ -205,7 +205,7 @@ return 1; } -#if HAVE_MP3LAME >= 392 +#ifdef HAVE_MP3LAME_PRESET /* lame_presets_set taken out of presets_set in lame-3.93.1/frontend/parse.c and modified */ static int lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name ) @@ -256,7 +256,7 @@ preset_name = "256"; } -#if HAVE_MP3LAME >= 393 +#ifdef HAVE_MP3LAME_PRESET_MEDIUM if (strcmp(preset_name, "medium") == 0) { if (fast > 0) lame_set_preset(gfp, MEDIUM_FAST); @@ -321,7 +321,7 @@ } #endif -#if HAVE_MP3LAME >= 392 +#ifdef HAVE_MP3LAME_PRESET /* lame_presets_longinfo_dm taken out of presets_longinfo_dm in lame-3.93.1/frontend/parse.c and modified */ static void lame_presets_longinfo_dm ( FILE* msgfp )

1 0

CVS: main configure,1.1085,1.1086
by syncmail＠mplayerhq.hu 18 Oct '05

18 Oct '05

CVS change done by Aurelien Jacobs CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv2683 Modified Files: configure Log Message: replace mp3lame version detection by required features detection Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1085 retrieving revision 1.1086 diff -u -r1.1085 -r1.1086 --- configure 18 Oct 2005 21:37:28 -0000 1.1085 +++ configure 18 Oct 2005 21:40:16 -0000 1.1086 @@ -6181,6 +6181,8 @@ echocheck "libmp3lame (for mencoder)" _mp3lame=no + _def_mp3lame_preset='#undef HAVE_MP3LAME_PRESET' + _def_mp3lame_preset_medium='#undef HAVE_MP3LAME_PRESET_MEDIUM' cat > $TMPC <<EOF #include <lame/lame.h> int main(void) { lame_version_t lv; (void) lame_init(); get_lame_version_numerical(&lv); printf("%d%d\n",lv.major,lv.minor); return 0; } @@ -6188,12 +6190,20 @@ # Note: libmp3lame usually depends on vorbis cc_check -lmp3lame $_ld_vorbis $_ld_lm && "$TMPO" >> "$TMPLOG" 2>&1 && _mp3lame=yes if test "$_mp3lame" = yes ; then - _def_mp3lame="#define HAVE_MP3LAME `$TMPO`" - _def_cfg_mp3lame="#define CONFIG_MP3LAME `$TMPO`" + _def_mp3lame="#define HAVE_MP3LAME" _ld_mp3lame="-lmp3lame $_ld_vorbis" + cat > $TMPC << EOF +#include <lame/lame.h> +int main(void) { int p = STANDARD_FAST; return 0; } +EOF + cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset="#define HAVE_MP3LAME_PRESET" + cat > $TMPC << EOF +#include <lame/lame.h> +int main(void) { int p = MEDIUM_FAST; return 0; } +EOF + cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" else _def_mp3lame='#undef HAVE_MP3LAME' - _def_cfg_mp3lame='#undef CONFIG_MP3LAME' fi echores "$_mp3lame" @@ -7184,7 +7194,8 @@ /* Indicates if libmp3lame is available Note: for mencoder */ $_def_mp3lame -$_def_cfg_mp3lame +$_def_mp3lame_preset +$_def_mp3lame_preset_medium /* Define libmp1e for realtime mpeg encoding (for DXR3 and DVB cards) */ $_def_mp1e

1 0

CVS: main configure,1.1084,1.1085
by syncmail＠mplayerhq.hu 18 Oct '05

18 Oct '05

CVS change done by Aurelien Jacobs CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv31021 Modified Files: configure Log Message: modify DirectFB version detection so that it only requires pre-processing Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1084 retrieving revision 1.1085 diff -u -r1.1084 -r1.1085 --- configure 18 Oct 2005 21:34:54 -0000 1.1084 +++ configure 18 Oct 2005 21:37:28 -0000 1.1085 @@ -3454,21 +3454,20 @@ _directfb=no cat > $TMPC <<EOF #include <directfb.h> -int main(void) { IDirectFB *foo; return 0; } +int main(void) { IDirectFB *foo; DirectFBInit(0,0); return 0; } EOF linux && test -c /dev/fb0 && cc_check $_inc_directfb -ldirectfb && _directfb=yes fi if test "$_directfb" = yes; then -cat > $TMPC <<EOF -#include <directfb.h> -int main(void) { - printf ("%i",(directfb_major_version*100+directfb_minor_version)*100+directfb_micro_version); - return 0; -} + cat > $TMPC << EOF +#include <directfb_version.h> +int +dfb_ver = DIRECTFB_MAJOR_VERSION DIRECTFB_MINOR_VERSION DIRECTFB_MICRO_VERSION +; EOF - if cc_check $_inc_directfb -ldirectfb && "$TMPO" >> "$TMPLOG" ; then - _directfb_version=`"$TMPO"` + if $_cc -E $TMPC $_inc_directfb > "$TMPO"; then + _directfb_version=`sed -n 's/^dfb_ver[^1-9]*$.*$/\1/p' "$TMPO" | tr -d '() '` _def_directfb_version="#define DIRECTFBVERSION $_directfb_version" if test "$_directfb_version" -ge 913; then _res_comment="$_directfb_version"

1 0

CVS: main configure,1.1083,1.1084
by syncmail＠mplayerhq.hu 18 Oct '05

18 Oct '05

CVS change done by Aurelien Jacobs CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv4733 Modified Files: configure Log Message: modify alsa version detection so that it don't require running the generated binary Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1083 retrieving revision 1.1084 diff -u -r1.1083 -r1.1084 --- configure 18 Oct 2005 21:30:43 -0000 1.1083 +++ configure 18 Oct 2005 21:34:54 -0000 1.1084 @@ -4687,31 +4687,46 @@ _alsa=no cat > $TMPC << EOF #include <sys/asoundlib.h> -int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)); } +#if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)) +#error "alsa version != 0.5.x" +#endif +int main(void) { return 0; } EOF - cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.5.x' + cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.5.x' cat > $TMPC << EOF #include <sys/asoundlib.h> -int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); } +#if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)) +#error "alsa version != 0.9.x" +#endif +int main(void) { return 0; } EOF - cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-sys' + cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.9.x-sys' cat > $TMPC << EOF #include <alsa/asoundlib.h> -int main(void) { return (!(SND_LIB_MAJOR==0 && SND_LIB_MINOR==9)); } +#if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)) +#error "alsa version != 0.9.x" +#endif +int main(void) { return 0; } EOF - cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='0.9.x-alsa' + cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.9.x-alsa' cat > $TMPC << EOF #include <sys/asoundlib.h> -int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); } +#if !((SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)) +#error "alsa version != 1.0.x" +#endif +int main(void) { return 0; } EOF - cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='1.0.x-sys' + cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-sys' cat > $TMPC << EOF #include <alsa/asoundlib.h> -int main(void) { return (!(SND_LIB_MAJOR==1 && SND_LIB_MINOR==0)); } +#if !((SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)) +#error "alsa version != 1.0.x" +#endif +int main(void) { return 0; } EOF - cc_check -lasound $_ld_dl $_ld_pthread && $TMPO && _alsaver='1.0.x-alsa' + cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-alsa' fi _def_alsa5='#undef HAVE_ALSA5' _def_alsa9='#undef HAVE_ALSA9'

1 0

CVS: main configure,1.1082,1.1083
by syncmail＠mplayerhq.hu 18 Oct '05

18 Oct '05

CVS change done by Aurelien Jacobs CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv4072 Modified Files: configure Log Message: add a cxx_check function to simplify C++ libs checking Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.1082 retrieving revision 1.1083 diff -u -r1.1082 -r1.1083 --- configure 17 Oct 2005 04:51:34 -0000 1.1082 +++ configure 18 Oct 2005 21:30:43 -0000 1.1083 @@ -30,13 +30,13 @@ # Prefer these macros to full length text ! # These macros only return an error code - NO display is done -cc_check() { +compile_check() { echo >> "$TMPLOG" - cat "$TMPC" >> "$TMPLOG" + cat "$1" >> "$TMPLOG" echo >> "$TMPLOG" - echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$TMPLOG" + echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra -o $TMPO $@" >> "$TMPLOG" rm -f "$TMPO" - $_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" >> "$TMPLOG" 2>&1 + $_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra -o "$TMPO" "$@" >> "$TMPLOG" 2>&1 TMP="$?" echo >> "$TMPLOG" echo "ldd $TMPO" >> "$TMPLOG" @@ -45,6 +45,14 @@ return "$TMP" } +cc_check() { + compile_check $TMPC $@ +} + +cxx_check() { + compile_check $TMPCPP $@ -lstdc++ +} + # Display error message, flushes tempfile, exit die () { echo @@ -5619,9 +5627,7 @@ int myclass::myreturn(void) { ret = 0; return ret ; } int main(void) { myclass myobject; return myobject.myreturn(); } EOF - echo "------------------------------------------------" >> "$TMPLOG" - cat "$TMPCPP" >> "$TMPLOG" - if ( $_cc "$TMPCPP" -o "$TMPO" && "$TMPO" ) >> "$TMPLOG" 2>&1 ; then + if cxx_check && "$TMPO" >> "$TMPLOG" 2>&1 ; then _dshow=yes echores "yes (C++ is ok)" else @@ -5727,9 +5733,7 @@ echocheck "LIVE555 Streaming Media libraries" if test "$_live" = auto && test "$_network" = yes ; then - _TMPC=$TMPC - TMPC=$TMPCPP - cat >$TMPC <<EOF + cat > $TMPCPP << EOF #include <liveMedia.hh> #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1090195200) #error Please upgrade to version 2004.07.19 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/> @@ -5739,15 +5743,13 @@ _live=no for I in "$_livelibdir" "$_libdir/live" "/usr/lib/live" "/usr/local/live" "/usr/local/lib/live" ; do - cc_check -I$I/liveMedia/include -I$I/UsageEnvironment/include -I$I/groupsock/include && _livelibdir=$I && _live=yes && break + cxx_check -I$I/liveMedia/include -I$I/UsageEnvironment/include -I$I/groupsock/include && _livelibdir=$I && _live=yes && break done if test "$_live" != yes ; then - if cc_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock; then + if cxx_check -I/usr/include/liveMedia -I/usr/include/UsageEnvironment -I/usr/include/groupsock; then _live_dist=yes fi fi - - TMPC=$_TMPC fi if test "$_live" = yes && test "$_network" = yes ; then echores "yes (using $_livelibdir)"

1 0

CVS: main ChangeLog,1.257,1.258
by syncmail＠mplayerhq.hu 18 Oct '05

18 Oct '05

CVS change done by Roberto Togni CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv7592 Modified Files: ChangeLog Log Message: Update Index: ChangeLog =================================================================== RCS file: /cvsroot/mplayer/main/ChangeLog,v retrieving revision 1.257 retrieving revision 1.258 diff -u -r1.257 -r1.258 --- ChangeLog 15 Oct 2005 23:52:56 -0000 1.257 +++ ChangeLog 18 Oct 2005 20:20:19 -0000 1.258 @@ -37,6 +37,7 @@ * On2 VP7 video decoder via binary DLL * Duck/On2 TrueMotion2 (TM20) support via lavc * support FLX and DTA extensions for flic files + * QDM2 audio decoding via lavc Demuxers: * simultaneous audio capture/playback (-tv immediatemode=0) fixed in v4l2 @@ -70,6 +71,7 @@ * Indeo2 (RT21) decoder * Duck/On2 TrueMotion2 (TM20) decoder * FLX and DTA extensions for flic + * QDM2 audio decoder GUI: * ported to GTK2

1 0

CVS: main/etc codecs.conf,1.434,1.435
by syncmail＠mplayerhq.hu 18 Oct '05

18 Oct '05

CVS change done by Roberto Togni CVS Update of /cvsroot/mplayer/main/etc In directory mail:/var2/tmp/cvs-serv1610 Modified Files: codecs.conf Log Message: Add FFmpeg QDM2 audio decoder Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.434 retrieving revision 1.435 diff -u -r1.434 -r1.435 --- codecs.conf 15 Oct 2005 23:24:53 -0000 1.434 +++ codecs.conf 18 Oct 2005 20:18:28 -0000 1.435 @@ -2063,6 +2063,13 @@ dll "wmavds32.ax" guid 0x795b44c4, 0xf142, 0x493d, 0x8a, 0x02, 0x09, 0xbd, 0x41, 0x08, 0x95, 0xad +audiocodec ffqdm2 + info "FFmpeg QDM2 audio decoder" + status working + format 0x324D4451 ; "QDM2" + driver ffmpeg + dll "qdm2" + audiocodec qdmc info "QuickTime QDMC/QDM2 audio decoders" status working

1 0