Mercurial > mplayer.hg
diff mencoder.c @ 11875:6b28eb95c08b
* changes mencoder's exit code on explicit kill to 2
* add quiet/noquiet to mencoder
* dont depend targets on themselfs
patch by Oswald Buddenhagen <ossi@kde.org>
additionaly moved quiet/noquiet and v/verbose to cfg-common.h
| author | attila |
|---|---|
| date | Thu, 29 Jan 2004 12:01:26 +0000 |
| parents | 6a25f1b5cc70 |
| children | 73b7ddcf4cbe |
line wrap: on
line diff
--- a/mencoder.c Thu Jan 29 11:04:35 2004 +0000 +++ b/mencoder.c Thu Jan 29 12:01:26 2004 +0000 @@ -129,6 +129,7 @@ //void resync_audio_stream(sh_audio_t *sh_audio){} int verbose=0; // must be global! +int quiet=0; double video_time_usage=0; double vout_time_usage=0; double max_video_time_usage=0; @@ -317,7 +318,7 @@ static void exit_sighandler(int x){ at_eof=1; - interrupted=1; + interrupted=2; /* 1 means error */ } static muxer_t* muxer=NULL; @@ -1376,6 +1377,7 @@ (int)demuxer->filepos, (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", mux_v->timer, decoded_frameno, (int)(p*100), @@ -1398,6 +1400,7 @@ (mux_v->timer>1) ? (int)(mux_v->size/mux_v->timer/125) : 0, (mux_a && mux_a->timer>1) ? (int)(mux_a->size/mux_a->timer/125) : 0 ); + } #endif } fflush(stdout);