Mercurial > mplayer.hg
changeset 2530:6fe4d4a5a0ff
-encode killed
| author | arpi |
|---|---|
| date | Mon, 29 Oct 2001 00:55:54 +0000 |
| parents | 266dab71162b |
| children | cf6a236b2d00 |
| files | cfg-mplayer.h mplayer.c |
| diffstat | 2 files changed, 12 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mplayer.h Mon Oct 29 00:55:15 2001 +0000 +++ b/cfg-mplayer.h Mon Oct 29 00:55:54 2001 +0000 @@ -131,7 +131,7 @@ {"monitor_vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0}, {"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0}, #endif - {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0}, +// {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0}, #ifdef USE_SUB {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0}, #ifdef USE_ICONV @@ -229,7 +229,7 @@ {"oldpp", "MPlayer was compiled without opendivx library", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, #endif {"autoq", &auto_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100}, - {"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000}, +// {"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000}, #ifdef HAVE_PNG {"z", &z_compression, CONF_TYPE_INT, CONF_RANGE, 0, 9}, #endif
--- a/mplayer.c Mon Oct 29 00:55:15 2001 +0000 +++ b/mplayer.c Mon Oct 29 00:55:54 2001 +0000 @@ -126,9 +126,9 @@ #include "stheader.h" -char* encode_name=NULL; -char* encode_index_name=NULL; -int encode_bitrate=0; +//char* encode_name=NULL; +//char* encode_index_name=NULL; +//int encode_bitrate=0; int get_video_quality_max(sh_video_t *sh_video); void set_video_quality(sh_video_t *sh_video,int quality); @@ -318,11 +318,11 @@ } #endif - if(mask&INITED_ENCODE){ - inited_flags&=~INITED_ENCODE; - current_module="uninit_encode"; - avi_fixate(); - } +// if(mask&INITED_ENCODE){ +// inited_flags&=~INITED_ENCODE; +// current_module="uninit_encode"; +// avi_fixate(); +// } if(mask&INITED_STREAM){ inited_flags&=~INITED_STREAM; @@ -985,6 +985,7 @@ } // ================== Init output files for encoding =============== +#if 0 if(encode_name){ // encode file!!! FILE *encode_file=fopen(encode_name,"rb"); @@ -1009,6 +1010,7 @@ sh_audio=d_audio->sh=NULL; // force nosound inited_flags|=INITED_ENCODE; } +#endif // ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============