[MPlayer-dev-eng] a few patches
Oswald Buddenhagen
ossi at kde.org
Fri Jan 16 13:48:07 CET 2004
moin,
mp-excode.diff changes mencoder's exit code on explicit kill to 2. this
is pretty logical - interruption is not necessarily an error, even quite
probably not. i need this for scripting purposes.
mp-quiet.diff adds -quiet/-noquiet switches to mencoder. quiet simply
suppresses the progress information. this is a must-have when
redirecting output to a log file.
mp-loader.diff is of no particular relevance, but it's lieing around
here forever. it's not really useful for a target to depend on itself.
cc: me on replies.
greetings
--
Chaos, panic, and disorder - my work here is done.
-------------- next part --------------
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.230
diff -U2 -r1.230 mencoder.c
--- mencoder.c 12 Jan 2004 03:47:49 -0000 1.230
+++ mencoder.c 16 Jan 2004 12:19:43 -0000
@@ -315,5 +316,5 @@
static void exit_sighandler(int x){
at_eof=1;
- interrupted=1;
+ interrupted=2; /* 1 means error */
}
-------------- next part --------------
Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.74
diff -U2 -r1.74 cfg-mencoder.h
--- cfg-mencoder.h 8 Dec 2003 12:43:48 -0000 1.74
+++ cfg-mencoder.h 16 Jan 2004 12:19:33 -0000
@@ -229,5 +229,6 @@
#undef MAIN_CONF
-// {"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL},
+ {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
+ {"noquiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL},
{"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL},
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.230
diff -U2 -r1.230 mencoder.c
--- mencoder.c 12 Jan 2004 03:47:49 -0000 1.230
+++ mencoder.c 16 Jan 2004 12:19:43 -0000
@@ -130,4 +130,5 @@
int verbose=0; // must be global!
+int quiet=0;
double video_time_usage=0;
double vout_time_usage=0;
@@ -1372,4 +1373,5 @@
(int)demuxer->movi_end);
#else
+ if(!quiet) {
if(verbose>0) {
mp_msg(MSGT_AVSYNC,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %3dfps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d] A/Vms %d/%d D/B/S %d/%d/%d \r",
@@ -1394,4 +1396,5 @@
(mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0
);
+ }
#endif
}
-------------- next part --------------
Index: loader/Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/loader/Makefile,v
retrieving revision 1.13
diff -U2 -r1.13 Makefile
--- loader/Makefile 21 Apr 2003 19:35:39 -0000 1.13
+++ loader/Makefile 16 Jan 2004 12:19:44 -0000
@@ -28,5 +28,5 @@
distclean: clean
-.c.o: $@
+.c.o:
$(CC) $(CFLAGS) $(DEFINES) -c $<
More information about the MPlayer-dev-eng
mailing list