April 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main Makefile,1.175,1.176
by Alex Beregszaszi 15 Apr '02

15 Apr '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv13806 Modified Files: Makefile Log Message: removed unused XP, TVISION and AVIP stuff Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- Makefile 13 Apr 2002 19:14:31 -0000 1.175 +++ Makefile 15 Apr 2002 17:09:23 -0000 1.176 @@ -6,23 +6,11 @@ include config.mak -ifeq ($(ENABLE_XP),yes) -PRG = mplayerxp -PRG_HQ = mplayerHQxp -PRG_AVIP = aviparsexp -PRG_FIBMAP = fibmap_mplayerxp -PRG_TV = tvisionxp -PRG_CFG = codec-cfg-xp -PRG_MENCODER = mencoderxp -else PRG = mplayer -PRG_HQ = mplayerHQ -PRG_AVIP = aviparse PRG_FIBMAP = fibmap_mplayer -PRG_TV = tvision PRG_CFG = codec-cfg PRG_MENCODER = mencoder -endif + # these subdirectories required installation due binaries within them ifeq ($(VIDIX),yes) SUBDIRS += libdha vidix @@ -100,8 +88,6 @@ all: $(ALL_PRG) -# $(PRG_AVIP) - .c.o: $(CC) -c $(CFLAGS) -o $@ $< @@ -261,7 +247,7 @@ -rm -f *.o *~ $(OBJS) distclean: - -rm -f *~ $(PRG) $(PRG_FIBMAP) $(PRG_HQ) $(PRG_AVIP) $(PRG_TV) $(OBJS) $(PRG_MENCODER) + -rm -f *~ $(PRG) $(PRG_FIBMAP) $(PRG_MENCODER) $(OBJS) -rm -f *.o *.a .depend configure.log @for a in $(PARTS); do $(MAKE) -C $$a distclean; done

1 0

CVS: main configure,1.424,1.425
by Alex Beregszaszi 15 Apr '02

15 Apr '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv13305 Modified Files: configure Log Message: removed unused XP stuff Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.424 retrieving revision 1.425 diff -u -r1.424 -r1.425 --- configure 13 Apr 2002 17:44:14 -0000 1.424 +++ configure 15 Apr 2002 17:08:02 -0000 1.425 @@ -226,7 +226,6 @@ _cc=gcc test "$CC" && _cc="$CC" _as=auto -_enable_xp=no _runtime_cpudetection=yes for ac_option do case "$ac_option" in @@ -245,12 +244,6 @@ --disable-gcc-checking) _skip_cc_check=yes ;; - --enable-xp) - _enable_xp=yes - ;; - --disable-xp) - _enable_xp=no - ;; --enable-static) _ld_static='-static' ;; @@ -3337,10 +3330,6 @@ fi echores "$_lirc" -# checking for extra performance -_def_xp='#undef __ENABLE_XP' -test "$_enable_xp" = yes && _def_xp='#define __ENABLE_XP 1' -echo Checking for xp = bleeding edge ... "$_enable_xp" ############################################################################# echo "Creating config.mak" @@ -3442,10 +3431,6 @@ GUI = $_gui DEBUG = -DDEBUG -# --- HAZARDOUS STUFF - -ENABLE_XP=$_enable_xp - EOF ############################################################################# @@ -3778,12 +3763,6 @@ #if defined(HAVE_GL) || defined(HAVE_X11) || defined(HAVE_XV) #define X11_FULLSCREEN 1 -#endif - -$_def_xp - -#ifdef __ENABLE_XP -#define __ENABLE_DEC_AHEAD 1 #endif EOF

1 0

CVS: main/TOOLS mencvcd,1.1,1.2
by Atmosfear 15 Apr '02

15 Apr '02

Update of /cvsroot/mplayer/main/TOOLS In directory mplayer:/var/tmp.root/cvs-serv14378/TOOLS Modified Files: mencvcd Log Message: Updated to support resampling audio and multiple cds. Index: mencvcd =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/mencvcd,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mencvcd 11 Apr 2002 22:53:48 -0000 1.1 +++ mencvcd 15 Apr 2002 14:01:07 -0000 1.2 @@ -1,28 +1,42 @@ #!/bin/sh # -# Version: 0.1.1 +# Version: 0.1.2 # # Licence: GPL # -# 2002/05/11 Jürgen Hammelmann <juergen.hammelmann(a)gmx.de> +# 2002/04/14 Jürgen Hammelmann <juergen.hammelmann(a)gmx.de> # # Script: MPlayer Sources (DVD) to (S)VCD ripping and burning # # requires: newest mplayer cvs version # mjpegtools v1.6 beta -# toolame # vcdimager # cdrdao +# lame # ################################################################################ # -# global options section, change them to your needs! +# 2002/04/11 v0.1.0: first version +# 2002/04/12 v0.1.1: +# 2002/04/14 v0.1.2: +# - handles now multiple vcd's +# - support's mp3 audio as option +# - use of mp2enc/lame instead of toolame because of support +# of resampling and mp3 +# +################################################################################ +# +# global config section, change them to your needs! TMPDIR="." # path to directory for creating temporary files, recommended 2-3GB space CDDRV="generic-mmc" # cdrdao: cdwriter driver CDDEV="--device 0,1,0" # or comment out and create link /dev/cdrecorder to your cdwriter dev + +################################################################################ +AUDIO="audiodump.wav" +VIDEO="stream.yuv" ################################################################################ function usage() { @@ -30,20 +44,22 @@ echo echo "$HOWCALLED options:" echo - echo "-w outputs in wide screen format 16:9" - echo "-abr <n> audio bitrate in kbs [224]" - echo "-asr <n> audio sample rate in Hz [44100]" - echo "-blank cleans cd-rw before burning" - echo "-burn enables burning [default]" - echo "-denoise denoises mpeg stream" - echo "-noburn disables burning" - echo "-mpg don't encode from source, multiplex/burn only the mpeg stream" - echo "-vcdout encode to VCD format [default]" - echo "-svcdout encode to SVCD format" + echo "-h|-? help" + echo "-w outputs in wide screen format 16:9" + echo "-abr <n> output audio bitrate in kbs [224]" + echo "-asr <n> output audio sample rate in Hz [48000]" + echo "-blank cleans cd-rw before burning" + echo "-cdsize <n> maximal size of cd images [646]" + echo "-denoise denoises mpeg stream" + echo "-noburn disables burning" + echo "-mp3 outputs audio in mp3 instead of mp2 format" + echo "-mpg don't encode from source, multiplex/burn" + echo " only the encoded mpg stream" + echo "-vcdout encode to VCD format [default]" + echo "-svcdout encode to SVCD format" echo echo "example:" - echo "'$HOWCALLED crazy -dvd 3 -w' encodes and burns dvd title 3 to VCD in wide" - echo " screen format." + echo "'$HOWCALLED crazy -dvd 3 -w' encodes and burns dvd title 3 to VCD in 16:9." } HOWCALLED=`basename $0` @@ -55,47 +71,58 @@ shift 1 cd $TMPDIR -rm -f stream.yuv -rm -f audiodump.pcm -rm -f audiodump.wav -mkfifo -m 660 stream.yuv -mkfifo -m 660 audiodump.pcm -mkfifo -m 660 audiodump.wav +rm -f $VIDEO +rm -f $AUDIO +# create a named pipe for video stream +mkfifo -m 660 $VIDEO +# some inits params="" wide="" blank=0 burn=1 +mp3=0 mkstream=1 abr=224 -masr=44100 +abrset=0 +asr=44100 denoise="cat -" norm="VCD" -mplexnorm="-f 2 -V" -mpegnorm="-f 2 -b 1152" +mplexnorm="-f 2 -m 1 -V" +max=646 +mpegnorm="-f 2 -b 1152 -B 260" imaget="-t vcd2" while [ "$1"x != "x" ]; do case $1 in -w) wide="-M WIDE2STD" ;; + -h|-?) + usage + exit 0 + ;; -abr) abr=$2 + abrset=1 shift 1 ;; -asr) - masr=$2 + asr=$2 + shift 1 + ;; + -cdsize) + max=$2 shift 1 ;; -blank) blank=1 ;; - -burn) - burn=1 - ;; -noburn) burn=0 ;; + -mp3) + mp3=1 + ;; -mpg) mkstream=0 ;; @@ -104,14 +131,14 @@ ;; -vcdout) norm="VCD" - mplexnorm="-f 2 -V" - mpegnorm="-f 2 -b 1152" + mplexnorm="-f 2 -m 1 -V" + mpegnorm="-f 2 -b 1152 -B 260" imaget="-t vcd2" ;; -svcdout) norm="SVCD" - mplexnorm="-f 4 -V" - mpegnorm="-f 4" + mplexnorm="-f 4 -m 2 -V" + mpegnorm="-f 4 -b 2500 -B 260" imaget="-t svcd" ;; *) @@ -121,6 +148,7 @@ shift 1 done +# some configs if [ -n "$wide" ]; then if [ "$norm" == "SVCD" ]; then wide="" @@ -128,46 +156,71 @@ fi fi +# with mp3 audio set the default audio bitrate to 128 kbs +if [ $mp3 -eq 1 -a $abrset -eq 0 ]; then + abr=128 +fi + +# audio sample rate in kHz +((a=$asr / 1000)) +((b=$asr % 1000)) +[ $b -le 9 ] && b="00$b00" +[ $b -le 99 ] && b="0$b00" +kasr="$a.$b" + # encode streams if [ $mkstream -eq 1 ]; then # start mplayer - mplayer -noframedrop -aop list=resample:fout=$masr -vo yuv4mpeg -ao pcm \ - -waveheader $params & + mplayer -noframedrop -vo yuv4mpeg -ao pcm -waveheader $params & - # mjpegtools / sox - ($denoise < stream.yuv | \ + # mjpegtools + ($denoise < $VIDEO | \ yuvscaler -v 0 $wide -O $norm | \ - mpeg2enc -v 0 -s $mpegnorm -g 6 -G 15 -r 16 -o $NAME.mpv) & - - # we have to use toolame, mp2enc don't understand audiodump.wav directly, no RIFF header?! - (toolame -m s -b $abr audiodump.wav $NAME.mpa) & + mpeg2enc -v 0 -s $mpegnorm -S $max -g 6 -G 15 -r 16 -o $NAME.mpv) & # wait for finishing the subprocesses wait + + if [ $mp3 -eq 0 ]; then + # mp2enc/lame can't read audiodump.wav directly from named pipe, + # we have to read the whole file. + mp2enc -b $abr -r $asr -o $NAME.mpa < $AUDIO + else + lame -b $abr --resample $kasr - $NAME.mpa < $AUDIO + fi fi -# remove pipes -rm -f stream.yuv -rm -f audiodump.pcm -rm -f audiodump.wav +# remove pipe and wav file, won't need anymore! +rm -f $VIDEO +rm -f $AUDIO # multiplex streams [ -f $NAME.mpv -a -f $NAME.mpa ] || exit 1 -rm -f $NAME.mpg -mplex $mplexnorm $NAME.mpv $NAME.mpa -o $NAME.mpg +rm -f ${NAME}*.mpg +mplex $mplexnorm $NAME.mpv $NAME.mpa -o ${NAME}%d.mpg -# create cd image -[ -f $NAME.mpg ] || exit 1 -rm -f $NAME.cue $NAME.bin -vcdimager $imaget -c $NAME.cue -b $NAME.bin $NAME.mpg +# create cd images +for mpg in ${NAME}*.mpg; do + [ -f $mpg ] || exit 1 + cue="`basename $mpg .mpg`.cue" + bin="`basename $mpg .mpg`.bin" + rm -f $cue $bin + vcdimager $imaget -c $cue -b $bin $mpg +done -# burn the vcd +# burn the (s)vcd's [ $burn -eq 0 ] && exit 0 -[ -f $NAME.bin -a -f $NAME.cue ] || exit 1 -if [ $blank -eq 1 ]; then - cdrdao blank --reload $CDDEV --driver $CDDRV --blank-mode minimal -fi -cdrdao write --reload $CDDEV --driver $CDDRV $NAME.cue +for cue in ${NAME}*.cue; do + bin="`basename $cue .cue`.bin" + [ -f $bin -a -f $cue ] || exit 1 + + echo "please insert a cd in your cdwriter, after a keypress we start:" + read -n 1 i + if [ $blank -eq 1 ]; then + cdrdao blank --reload $CDDEV --driver $CDDRV --blank-mode minimal + fi + cdrdao write --reload $CDDEV --driver $CDDRV $cue +done exit 0

1 0

CVS: main/libmpcodecs ve_lavc.c,1.6,1.7
by Arpi of Ize 15 Apr '02

15 Apr '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mplayer:/var/tmp.root/cvs-serv5548 Modified Files: ve_lavc.c Log Message: 2-pass qscale fixed Index: ve_lavc.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/ve_lavc.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ve_lavc.c 14 Apr 2002 23:16:55 -0000 1.6 +++ ve_lavc.c 15 Apr 2002 13:39:48 -0000 1.7 @@ -153,7 +153,8 @@ 5) == -1){ mp_msg(MSGT_MENCODER,MSGL_ERR,"2pass failed: filename=%s\n", passtmpfile); pass=0; - } + } else + lavc_venc_context.flags|=CODEC_FLAG_QSCALE|CODEC_FLAG_TYPE; // VBR break; } @@ -199,13 +200,8 @@ if(pass==2){ // handle 2-pass: lavc_venc_context.flags|=CODEC_FLAG_QSCALE; // enable VBR lavc_venc_context.quality=VbrControl_get_quant(); -#ifdef CODEC_FLAG_TYPE - lavc_venc_context.flags|=CODEC_FLAG_TYPE; // force keyframes lavc_venc_context.key_frame=VbrControl_get_intra(); lavc_venc_context.gop_size=0x3fffffff; -#else -#error you should upgrade libavcodec... get latest CVS -#endif out_size = avcodec_encode_video(&lavc_venc_context, mux_v->buffer, mux_v->buffer_size, &lavc_venc_picture); VbrControl_update_2pass_vbr_encoding(lavc_venc_context.mv_bits,

1 0

CVS: main/drivers mgavid.patch,1.1,NONE
by Dariush Pietrzak 15 Apr '02

15 Apr '02

Update of /cvsroot/mplayer/main/drivers In directory mplayer:/var/tmp.root/cvs-serv28490 Removed Files: mgavid.patch Log Message: It is not the right place for this. --- mgavid.patch DELETED ---

1 0

CVS: main/libmpdemux demux_mov.c,1.58,1.59
by Arpi of Ize 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv30662 Modified Files: demux_mov.c Log Message: FPS calculation fixed Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- demux_mov.c 15 Apr 2002 01:58:18 -0000 1.58 +++ demux_mov.c 15 Apr 2002 02:48:11 -0000 1.59 @@ -457,14 +457,6 @@ trak->durmap[i].num=stream_read_dword(demuxer->stream); trak->durmap[i].dur=stream_read_dword(demuxer->stream); pts+=trak->durmap[i].num*trak->durmap[i].dur; - - if(i==0 && trak->type == MOV_TRAK_VIDEO) - { - sh_video_t* sh=get_sh_video(demuxer,priv->track_db); - if (sh && !sh->fps) - sh->fps = trak->timescale/trak->durmap[i].dur; - /* initial fps */ - } } if(trak->length!=pts) mp_msg(MSGT_DEMUX, MSGL_WARN, "Warning! pts=%d length=%d\n",pts,trak->length); break; @@ -876,7 +868,8 @@ // printf("pos=%d max=%d\n",pos,trak->stdata_len); } } - if(!sh->fps) sh->fps=trak->timescale; + sh->fps=trak->timescale/ + ((trak->durmap_size>=1)?(float)trak->durmap[0].dur:1); sh->frametime=1.0f/sh->fps; sh->disp_w=trak->stdata[25]|(trak->stdata[24]<<8);

1 0

CVS: main mencoder.c,1.118,1.119 cfg-mencoder.h,1.35,1.36
by Arpi of Ize 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv28315 Modified Files: mencoder.c cfg-mencoder.h Log Message: -skiplimit/-noskip options to disable fps correction Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- mencoder.c 15 Apr 2002 00:36:21 -0000 1.118 +++ mencoder.c 15 Apr 2002 02:33:05 -0000 1.119 @@ -132,6 +132,7 @@ float force_fps=0; float force_ofps=0; // set to 24 for inverse telecine +static int skip_limit=-1; int force_srate=0; @@ -862,11 +863,13 @@ // check frame duplicate/drop: -if(v_timer_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate){ +if(v_timer_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate && + (skip_limit<0 || skip_flag<skip_limit) ){ v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; ++skip_flag; // skip } else -while(v_timer_corr<=-(float)mux_v->h.dwScale/mux_v->h.dwRate){ +while(v_timer_corr<=-(float)mux_v->h.dwScale/mux_v->h.dwRate && + (skip_limit<0 || (-skip_flag)<skip_limit) ){ v_timer_corr+=(float)mux_v->h.dwScale/mux_v->h.dwRate; --skip_flag; // dup } Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- cfg-mencoder.h 15 Apr 2002 00:36:21 -0000 1.35 +++ cfg-mencoder.h 15 Apr 2002 02:33:05 -0000 1.36 @@ -81,6 +81,10 @@ {"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, {"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"skiplimit", &skip_limit, CONF_TYPE_INT, 0, 0, 0, NULL}, + {"noskiplimit", &skip_limit, CONF_TYPE_FLAG, 0, 0, -1, NULL}, + {"noskip", &skip_limit, CONF_TYPE_FLAG, 0, 0, 0, NULL}, + {"x", &vo_w, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"y", &vo_h, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},

1 0

CVS: main/libmpdemux demux_mov.c,1.57,1.58
by Arpi of Ize 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main/libmpdemux In directory mplayer:/var/tmp.root/cvs-serv23194 Modified Files: demux_mov.c Log Message: get aspect info from display size if != real size Index: demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -r1.57 -r1.58 --- demux_mov.c 27 Mar 2002 21:27:38 -0000 1.57 +++ demux_mov.c 15 Apr 2002 01:58:18 -0000 1.58 @@ -885,8 +885,12 @@ if(!sh->disp_w && !sh->disp_h) { sh->disp_w=trak->tkdata[77]|(trak->tkdata[76]<<8); sh->disp_h=trak->tkdata[81]|(trak->tkdata[80]<<8); - } - + } else if(sh->disp_w!=(trak->tkdata[77]|(trak->tkdata[76]<<8))){ + // codec and display width differ... use display one for aspect + sh->aspect=trak->tkdata[77]|(trak->tkdata[76]<<8); + sh->aspect/=trak->tkdata[81]|(trak->tkdata[80]<<8); + } + if(depth&(~15)) printf("*** depht = 0x%X\n",depth); // palettized?

1 0

CVS: main mplayer.c,1.467,1.468
by Arpi of Ize 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv18931 Modified Files: mplayer.c Log Message: dvdnav hotfix Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.467 retrieving revision 1.468 diff -u -r1.467 -r1.468 --- mplayer.c 14 Apr 2002 19:43:23 -0000 1.467 +++ mplayer.c 15 Apr 2002 01:50:00 -0000 1.468 @@ -2440,6 +2440,9 @@ dvdnav_priv_t * dvdnav_priv = (dvdnav_priv_t*)(stream->priv); dvdnav_event_t * dvdnav_event = (dvdnav_event_t *)(cmd->args[0].v.v); + /* ignore these events if we're not in dvd_nav mode */ + if (!dvd_nav) break; + if (!dvdnav_event) { printf("DVDNAV Event NULL?!\n"); break; @@ -2592,6 +2595,9 @@ } case MP_CMD_DVDNAV: { dvdnav_priv_t * dvdnav_priv=(dvdnav_priv_t*)stream->priv; + + /* ignore these events if we're not in dvd_nav mode */ + if (!dvd_nav) break; switch (cmd->args[0].v.i) { case MP_CMD_DVDNAV_UP:

1 0

CVS: main mencoder.c,1.117,1.118 cfg-common.h,1.38,1.39 cfg-mencoder.h,1.34,1.35 cfg-mplayer.h,1.143,1.144
by Arpi of Ize 14 Apr '02

14 Apr '02

Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv3150 Modified Files: mencoder.c cfg-common.h cfg-mencoder.h cfg-mplayer.h Log Message: -sb option re-added (noticed by Alexandre Oliva <oliva(a)lsd.ic.unicamp.br>) Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.117 retrieving revision 1.118 diff -u -r1.117 -r1.118 --- mencoder.c 13 Apr 2002 19:14:31 -0000 1.117 +++ mencoder.c 15 Apr 2002 00:36:21 -0000 1.118 @@ -382,7 +382,7 @@ } #endif - if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,0,0); + stream->start_pos+=seek_to_byte; #ifdef HAVE_LIBCSS // current_module="libcss"; @@ -402,6 +402,8 @@ mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_DVDauthOk); } #endif + + if(stream_cache_size) stream_enable_cache(stream,stream_cache_size*1024,0,0); if(!has_audio || demuxer2) audio_id=-2; /* do NOT read audio packets... */ Index: cfg-common.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-common.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- cfg-common.h 12 Apr 2002 10:40:37 -0000 1.38 +++ cfg-common.h 15 Apr 2002 00:36:21 -0000 1.39 @@ -38,6 +38,9 @@ {"csslib", "MPlayer was compiled WITHOUT libcss support!\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif + {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, + {"ss", &seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL}, + // ------------------------- demuxer options -------------------- {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1, NULL}, Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- cfg-mencoder.h 12 Apr 2002 21:50:38 -0000 1.34 +++ cfg-mencoder.h 15 Apr 2002 00:36:21 -0000 1.35 @@ -76,8 +76,6 @@ /* name, pointer, type, flags, min, max */ {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this must be the first!!! */ -// {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, - {"ss", &seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL}, {"endpos", parse_end_at, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, {"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- cfg-mplayer.h 4 Apr 2002 00:00:41 -0000 1.143 +++ cfg-mplayer.h 15 Apr 2002 00:36:21 -0000 1.144 @@ -189,8 +189,6 @@ #endif // {"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1, NULL}, // {"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, - {"ss", &seek_to_sec, CONF_TYPE_STRING, CONF_MIN, 0, 0, NULL}, {"sstep", &step_sec, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, {"noloop", &loop_times, CONF_TYPE_FLAG, 0, 0, -1, NULL}, {"loop", &loop_times, CONF_TYPE_INT, CONF_RANGE, -1, 10000, NULL},

1 0