June 2009 - MPlayer-cvslog - lists.mplayerhq.hu

r29361 - trunk/configure
by diego 14 Jun '09

14 Jun '09

Author: diego Date: Sun Jun 14 14:42:06 2009 New Revision: 29361 Log: Allow setting message language separately from documentation language. patch by Steve Dibb Steve Dibb, steve.dibb gmail com Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jun 14 14:31:35 2009 (r29360) +++ trunk/configure Sun Jun 14 14:42:06 2009 (r29361) @@ -439,9 +439,9 @@ Miscellaneous options: --target=PLATFORM target platform (i386-linux, arm-linux, etc) --enable-static build a statically linked binary --charset=charset convert the console messages to this character set + --language-msg=LINGUA language used for messages and the GUI [en] --language=list a white space or comma separated list of languages for - translated man pages, the first language is used for - messages and the GUI (the environment variable + translated man pages (the environment variable \$LINGUAS is also honored) [en] (Available: all $msg_lang_all) --with-install=PATH path to a custom install program @@ -849,6 +849,9 @@ for ac_option do --charset=*) _charset=$(echo $ac_option | cut -d '=' -f 2) ;; + --language-msg=*) + _language_msg=$(echo $ac_option | cut -d '=' -f 2) + ;; --language=*) _language=$(echo $ac_option | cut -d '=' -f 2) ;; @@ -2791,7 +2794,9 @@ echores "$_langinfo" echocheck "language" test -z "$_language" && _language=$LINGUAS +test -z "$_language_msg" && _language_msg=$LINGUAS _language=$(echo $_language | tr , " ") +_language_msg=$(echo $_language_msg | tr , " ") if $(echo $_language | grep -q all) ; then doc_lang=en ; doc_langs=$doc_lang_all man_lang=en ; man_langs=$man_lang_all @@ -2806,13 +2811,13 @@ else done man_langs=$tmp_man_langs doc_langs=$tmp_man_langs - for lang in $_language ; do + for lang in $_language_msg ; do if test -f "help/help_mp-${lang}.h" ; then msg_lang=$lang break else echo ${_echo_n} "$lang not found, ${_echo_c}" - _language=$(echo $_language | sed "s/$lang *//") + _language_msg=$(echo $_language_msg | sed "s/$lang *//") fi done fi

2 1

r29360 - trunk/configure
by diego 14 Jun '09

14 Jun '09

Author: diego Date: Sun Jun 14 14:31:35 2009 New Revision: 29360 Log: Drop redundant setting of message language to English when all languages are enabled. This is the default anyway. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Jun 13 14:32:05 2009 (r29359) +++ trunk/configure Sun Jun 14 14:31:35 2009 (r29360) @@ -2795,7 +2795,6 @@ _language=$(echo $_language | tr , " ") if $(echo $_language | grep -q all) ; then doc_lang=en ; doc_langs=$doc_lang_all man_lang=en ; man_langs=$man_lang_all - msg_lang=en else for lang in $_language ; do if test -d DOCS/man/$lang ; then

1 0

r29359 - trunk/etc/codecs.conf
by compn 13 Jun '09

13 Jun '09

Author: compn Date: Sat Jun 13 14:32:05 2009 New Revision: 29359 Log: sync with ffmpeg add m1v1 fourcc to mpeg1 codec add another format to ima wav adpcm from facebook samples Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri Jun 12 16:23:21 2009 (r29358) +++ trunk/etc/codecs.conf Sat Jun 13 14:32:05 2009 (r29359) @@ -111,7 +111,7 @@ videocodec mpegpes fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc VCR2 @@ -127,6 +127,7 @@ videocodec ffmpeg1 fourcc PIM1 ; Pinnacle hardware-MPEG-1 fourcc VCR2 fourcc MPEG + fourcc m1v1 driver ffmpeg dll "mpeg1video" out YV12,I420,IYUV @@ -197,7 +198,7 @@ videocodec ffmpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo" @@ -236,7 +237,7 @@ videocodec mpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" @@ -273,7 +274,7 @@ videocodec ffmpeg12mc fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv - fourcc m2v1 + fourcc m2v1,m1v1 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" @@ -311,7 +312,7 @@ videocodec ffmpeg12vdpau fourcc AVmp fourcc mp2v,mpgv fourcc LMP2 ; Lead mpeg2 in avi - fourcc m2v1 + fourcc m2v1,m1v1 driver ffmpeg dll "mpegvideo_vdpau" out VDPAU_MPEG1 @@ -3286,6 +3287,7 @@ audiocodec ffadpcmimawav status working format 0x11 format 0x1100736d ; "ms\x00\x11" (MOV files) + format 0x11005354 ; "TS\x00\x11" (MOV files) works with -demuxer mov driver ffmpeg dll adpcm_ima_wav

1 0

r29357 - trunk/etc/codecs.conf
by compn 12 Jun '09

12 Jun '09

Author: compn Date: Fri Jun 12 13:23:22 2009 New Revision: 29357 Log: sync with ffmpeg Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri Jun 12 04:39:21 2009 (r29356) +++ trunk/etc/codecs.conf Fri Jun 12 13:23:22 2009 (r29357) @@ -3739,6 +3739,7 @@ audiocodec ulaw status working format 0x7 format 0x77616c75 ; "ulaw" (MOV files) + format 0x6c75 driver alaw audiocodec dvdpcm @@ -3762,6 +3763,7 @@ audiocodec ffac3 format 0x2000 format 0x332D6361 ; ac-3 in mp4 fourcc dnet + fourcc sac3 driver ffmpeg dll ac3

1 0

r29356 - trunk/etc/codecs.conf
by compn 12 Jun '09

12 Jun '09

Author: compn Date: Fri Jun 12 04:39:21 2009 New Revision: 29356 Log: sync with ffmpeg Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Jun 11 19:10:54 2009 (r29355) +++ trunk/etc/codecs.conf Fri Jun 12 04:39:21 2009 (r29356) @@ -111,7 +111,11 @@ videocodec mpegpes fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc m2v1 + fourcc PIM1 ; Pinnacle hardware-MPEG-1 + fourcc PIM2 ; Pinnacle hardware-MPEG-2 fourcc VCR2 + fourcc LMP2 ; Lead mpeg2 in avi driver mpegpes out MPES @@ -154,6 +158,7 @@ videocodec ffmpeg2 fourcc AVmp fourcc VCR2 fourcc mp2v,mpgv + fourcc m2v1 fourcc PIM2 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg @@ -192,6 +197,7 @@ videocodec ffmpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc m2v1 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo" @@ -230,6 +236,7 @@ videocodec mpeg12 fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc m2v1 fourcc LMP2 ; Lead mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" @@ -266,6 +273,7 @@ videocodec ffmpeg12mc fourcc mx3n,mx3p fourcc AVmp fourcc mp2v,mpgv + fourcc m2v1 fourcc LMP2 ; Lead mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" @@ -303,6 +311,7 @@ videocodec ffmpeg12vdpau fourcc AVmp fourcc mp2v,mpgv fourcc LMP2 ; Lead mpeg2 in avi + fourcc m2v1 driver ffmpeg dll "mpegvideo_vdpau" out VDPAU_MPEG1 @@ -3048,6 +3057,7 @@ audiocodec ffqclp status buggy format 0x706C6351 ; "Qclp" format 0x70637173 ; "sqcp" + format 0x716C6351 ; "Qclq" driver ffmpeg dll "qcelp"

1 0

r29347 - trunk/vobsub.c
by compn 03 Jun '09

03 Jun '09

Author: compn Date: Wed Jun 3 19:27:22 2009 New Revision: 29347 Log: cosmetics: replace dead url Modified: trunk/vobsub.c Modified: trunk/vobsub.c ============================================================================== --- trunk/vobsub.c Wed Jun 3 16:06:10 2009 (r29346) +++ trunk/vobsub.c Wed Jun 3 19:27:22 2009 (r29347) @@ -1270,7 +1270,7 @@ create_idx(vobsub_out_t *me, const unsig "#\n" "# Generated by MPlayer " VERSION "\n" "# See <URL:http://www.mplayerhq.hu/> for more information about MPlayer\n" - "# See <URL:http://vobsub.edensrising.com/> for more information about Vobsub\n" + "# See <URL:http://wiki.multimedia.cx/index.php?title=VOBsub> for more information about Vobsub\n" "#\n" "size: %ux%u\n", orig_width, orig_height);

1 0

r29346 - trunk/stream/stream_file.c
by diego 03 Jun '09

03 Jun '09

Author: diego Date: Wed Jun 3 16:06:10 2009 New Revision: 29346 Log: Files should be opened in binary mode on OS/2. patch by KO Myung-Hun, komh chollian net Modified: trunk/stream/stream_file.c Modified: trunk/stream/stream_file.c ============================================================================== --- trunk/stream/stream_file.c Wed Jun 3 15:42:11 2009 (r29345) +++ trunk/stream/stream_file.c Wed Jun 3 16:06:10 2009 (r29346) @@ -119,7 +119,7 @@ static int open_f(stream_t *stream,int m filename++; #endif -#if defined(__CYGWIN__)|| defined(__MINGW32__) +#if defined(__CYGWIN__)|| defined(__MINGW32__) || defined(__OS2__) m |= O_BINARY; #endif @@ -128,13 +128,13 @@ static int open_f(stream_t *stream,int m // read from stdin mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_ReadSTDIN); f=0; // 0=stdin -#ifdef __MINGW32__ +#if defined(__MINGW32__) || defined(__OS2__) setmode(fileno(stdin),O_BINARY); #endif } else { mp_msg(MSGT_OPEN,MSGL_INFO,"Writing to stdout\n"); f=1; -#ifdef __MINGW32__ +#if defined(__MINGW32__) || defined(__OS2__) setmode(fileno(stdout),O_BINARY); #endif }

1 0

r29345 - trunk/cfg-common-opts.h
by diego 03 Jun '09

03 Jun '09

Author: diego Date: Wed Jun 3 15:42:11 2009 New Revision: 29345 Log: CONFIG_LIBNEMESI and CONFIG_LIVE555 are not defined to 0/1 values. Thus, we cannot check for them in an #if directive, but have to use #if defined() instead. Modified: trunk/cfg-common-opts.h Modified: trunk/cfg-common-opts.h ============================================================================== --- trunk/cfg-common-opts.h Tue Jun 2 20:37:31 2009 (r29344) +++ trunk/cfg-common-opts.h Wed Jun 3 15:42:11 2009 (r29345) @@ -83,12 +83,12 @@ #ifdef CONFIG_LIVE555 {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif /* CONFIG_LIVE555 */ -#ifdef CONFIG_LIBNEMESI || CONFIG_LIVE555 +#if defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555) // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP {"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #else {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" or \"libnemesi\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_LIVE555 || CONFIG_LIBNEMESI */ +#endif /* defined(CONFIG_LIBNEMESI) || defined(CONFIG_LIVE555) */ #ifdef CONFIG_LIBNEMESI {"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #else

1 0

r29321 - trunk/cfg-common-opts.h
by lu_zero 03 Jun '09

03 Jun '09

Author: lu_zero Date: Mon May 25 19:51:10 2009 New Revision: 29321 Log: Make sure -rtsp-stream-with-sctp is supported while building with libnemesi Modified: trunk/cfg-common-opts.h Modified: trunk/cfg-common-opts.h ============================================================================== --- trunk/cfg-common-opts.h Mon May 25 18:42:54 2009 (r29320) +++ trunk/cfg-common-opts.h Mon May 25 19:51:10 2009 (r29321) @@ -82,14 +82,18 @@ #ifdef CONFIG_LIVE555 {"sdp", "-sdp has been removed, use sdp://file instead.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, +#endif /* CONFIG_LIVE555 */ +#ifdef CONFIG_LIBNEMESI || CONFIG_LIVE555 // -rtsp-stream-over-tcp option, specifying TCP streaming of RTP/RTCP {"rtsp-stream-over-tcp", &rtspStreamOverTCP, CONF_TYPE_FLAG, 0, 0, 1, NULL}, -#elif defined (CONFIG_LIBNEMESI) - {"rtsp-stream-over-tcp", &rtsp_transport_tcp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, +#else + {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" or \"libnemesi\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, +#endif /* CONFIG_LIVE555 || CONFIG_LIBNEMESI */ +#ifdef CONFIG_LIBNEMESI {"rtsp-stream-over-sctp", &rtsp_transport_sctp, CONF_TYPE_FLAG, 0, 0, 1, NULL}, #else - {"rtsp-stream-over-tcp", "-rtsp-stream-over-tcp requires the \"LIVE555 Streaming Media\" libraries.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, -#endif /* CONFIG_LIVE555 */ + {"rtsp-stream-over-sctp", "-rtsp-stream-over-sctp requires the", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, +#endif /* CONFIG_LIBNEMESI */ #ifdef CONFIG_NETWORK {"rtsp-port", &rtsp_port, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL}, {"rtsp-destination", &rtsp_destination, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL},

2 1

r29344 - trunk/configure
by reimar 02 Jun '09

02 Jun '09

Author: reimar Date: Tue Jun 2 20:37:31 2009 New Revision: 29344 Log: Configure needs AS to be set for the Makefiles. Note that this may not be a pure assembler (i.e. AS=as is wrong), it must be a gcc-compatible assembler with preprocessor (e.g. AS=gcc). Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Jun 2 17:35:58 2009 (r29343) +++ trunk/configure Tue Jun 2 20:37:31 2009 (r29344) @@ -8124,6 +8124,7 @@ MANDIR = \$(DESTDIR)$_mandir CONFDIR = \$(DESTDIR)$_confdir AR = $_ar +AS = $_cc CC = $_cc CXX = $_cc HOST_CC = $_host_cc

1 0