diff options
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/mencoder.c b/mencoder.c index 98ea695332..6627332c17 100644 --- a/mencoder.c +++ b/mencoder.c @@ -117,8 +117,8 @@ static char* spudec_ifo=NULL; static char** audio_codec_list=NULL; // override audio codec static char** video_codec_list=NULL; // override video codec -static char** audio_fm_list=NULL; // override audio codec family -static char** video_fm_list=NULL; // override video codec family +static char** audio_fm_list=NULL; // override audio codec family +static char** video_fm_list=NULL; // override video codec family extern char *demuxer_name; // override demuxer extern char *audio_demuxer_name; // override audio demuxer extern char *sub_demuxer_name; // override sub demuxer @@ -308,7 +308,7 @@ static void parse_cfgfiles( m_config_t* conf ) char *conffile; if (!disable_system_conf && m_config_parse_config_file(conf, MPLAYER_CONFDIR "/mencoder.conf") < 0) - mencoder_exit(1,_("config file error")); + mencoder_exit(1,_("config file error")); if (!disable_user_conf) { if ((conffile = get_path("mencoder.conf")) == NULL) { @@ -420,7 +420,7 @@ audio_encoder_t *aencoder = NULL; #if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL) set_path_env(); #endif - + InitTimer(); // check codec.conf @@ -441,13 +441,13 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ { char *extension; - + if (!out_filename) mencoder_exit(1,_("No output file specified, please see the -o option.")); extension=strrchr(out_filename,'.'); if (extension != NULL && strlen(extension) > 3 && strlen(extension) < 6) { extension++; - + switch (out_file_format) { case MUXER_TYPE_AVI: @@ -458,12 +458,12 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){ case MUXER_TYPE_MPEG: if (strcasecmp(extension,"mpg") && strcasecmp(extension,"mpeg") && - strcasecmp(extension,"vob")) + strcasecmp(extension,"vob")) mp_tmsg(MSGT_MENCODER, MSGL_WARN, "\nWARNING: OUTPUT FILE FORMAT IS _MPEG_. See -of help.\n"); break; } } -} +} /* Display what configure line was used */ mp_msg(MSGT_MENCODER, MSGL_V, "Configuration: " CONFIGURATION "\n"); @@ -482,7 +482,7 @@ if (frameno_filename) { #ifdef CONFIG_PRIORITY set_priority(); -#endif +#endif // check font #ifdef CONFIG_FREETYPE @@ -516,7 +516,7 @@ play_next_file: m_config_push(mconfig); m_entry_set_options(mconfig,&filelist[curfile]); filename = filelist[curfile].name; - + if(!filename){ mp_tmsg(MSGT_CPLAYER, MSGL_FATAL, "\nFilename missing.\n\n"); mencoder_exit(1,NULL); @@ -559,7 +559,7 @@ if(stream->type==STREAMTYPE_DVDNAV){ } select_audio(demuxer, opts.audio_id, audio_lang); - + if (opts.sub_id < 0 && dvdsub_lang) opts.sub_id = demuxer_sub_track_by_lang(demuxer, dvdsub_lang); @@ -589,7 +589,7 @@ sh_video=d_video->sh; if(!sh_video) { - mp_tmsg(MSGT_CPLAYER,MSGL_FATAL,"Video stream is mandatory!\n"); + mp_tmsg(MSGT_CPLAYER,MSGL_FATAL,"Video stream is mandatory!\n"); mencoder_exit(1,NULL); } @@ -827,7 +827,7 @@ default: { sh_video->vfilter=vf_open_encoder(&opts, NULL,"xvid",(char *)mux_v); break; case VCODEC_QTVIDEO: sh_video->vfilter=vf_open_encoder(&opts, NULL,"qtvideo",(char *)mux_v); break; - case VCODEC_NUV: + case VCODEC_NUV: sh_video->vfilter=vf_open_encoder(&opts, NULL,"nuv",(char *)mux_v); break; case VCODEC_X264: sh_video->vfilter=vf_open_encoder(&opts, NULL,"x264",(char *)mux_v); break; @@ -909,7 +909,7 @@ if(mux_a->codec != ACODEC_COPY) { aencoder = new_audio_encoder(mux_a, &aparams); if(!aencoder) mencoder_exit(1, NULL); - if(!init_audio_filters(sh_audio, + if(!init_audio_filters(sh_audio, new_srate, &aparams.sample_rate, &aparams.channels, &aencoder->input_format)) { mp_tmsg(MSGT_CPLAYER,MSGL_FATAL,"Couldn't find matching filter/ao format!\n"); @@ -1044,7 +1044,7 @@ if (out_file_format == MUXER_TYPE_MPEG) } } -if(file_format == DEMUXER_TYPE_TV) +if(file_format == DEMUXER_TYPE_TV) { mp_tmsg(MSGT_MENCODER, MSGL_WARN, "Forcing audio preload to 0, max pts correction to 0.\n"); audio_preload = 0.0; @@ -1156,11 +1156,11 @@ if(sh_audio){ len = aencoder->decode_buffer_size; len = dec_audio(sh_audio, aencoder->decode_buffer, len); - mux_a->buffer_len += aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, + mux_a->buffer_len += aencoder->encode(aencoder, mux_a->buffer + mux_a->buffer_len, aencoder->decode_buffer, len, mux_a->buffer_size-mux_a->buffer_len); if(mux_a->buffer_len < mux_a->wf->nBlockAlign) len = 0; - else + else len = mux_a->wf->nBlockAlign*(mux_a->buffer_len/mux_a->wf->nBlockAlign); } else /* VBR */ @@ -1219,7 +1219,7 @@ if(sh_audio){ audiosamples++; audiorate+= (GetTimerMS() - ptimer_start); - + } } @@ -1312,9 +1312,9 @@ default: vf->control(vf, VFCTRL_DRAW_OSD, osd); } } - + if (sh_video->vf_initialized < 0) mencoder_exit(1, NULL); - + if(!blit_frame){ if (play_n_frames >= 0) play_n_frames++; @@ -1372,7 +1372,7 @@ if(sh_audio && !demuxer2){ // printf("samples=%d \n",samples); a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate; delay_corrected=1; - } else + } else #endif { // PTS = (last timestamp) + (bytes after last timestamp)/(bytes per sec) @@ -1441,7 +1441,7 @@ if(sh_audio && !demuxer2){ mp_msg(MSGT_STATUSLINE,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), (t>1) ? (int)(decoded_frameno/t+0.5) : 0, - (p>0.001) ? (int)((t/p-t)/60) : 0, + (p>0.001) ? (int)((t/p-t)/60) : 0, (p>0.001) ? (int)(stream_tell(muxer->stream)/p/1024/1024) : 0, v_pts_corr, (mux_v->timer>1) ? (int)(mux_v->size/mux_v->timer/125) : 0, @@ -1453,7 +1453,7 @@ if(sh_audio && !demuxer2){ mp_msg(MSGT_STATUSLINE,MSGL_STATUS,"Pos:%6.1fs %6df (%2d%%) %5.2ffps Trem:%4dmin %3dmb A-V:%5.3f [%d:%d]\r", mux_v->timer, decoded_frameno, (int)(p*100), (t>1) ? (float)(decoded_frameno/t) : 0, - (p>0.001) ? (int)((t/p-t)/60) : 0, + (p>0.001) ? (int)((t/p-t)/60) : 0, (p>0.001) ? (int)(stream_tell(muxer->stream)/p/1024/1024) : 0, v_pts_corr, (mux_v->timer>1) ? (int)(mux_v->size/mux_v->timer/125) : 0, |