[Mplayer-cvslog] 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

[Arpi of Ize]

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 at 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},