diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-22 17:04:39 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-10-22 17:04:39 +0000 |
| commit | b32c67928a94f0c31e97eb773f139478e006ef0a (patch) | |
| tree | 48893ea4132d0fac6bc41a87bedc7b4f32cf0a54 /mencoder.c | |
| parent | c2ba883f467e903542d16b437005a2f8055cc7fd (diff) | |
| download | mpv-b32c67928a94f0c31e97eb773f139478e006ef0a.tar.bz2 mpv-b32c67928a94f0c31e97eb773f139478e006ef0a.tar.xz | |
some updates in muxer api
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11223 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mencoder.c b/mencoder.c index 7bbbf46905..cf8392ed19 100644 --- a/mencoder.c +++ b/mencoder.c @@ -232,7 +232,7 @@ static int parse_end_at(m_option_t *conf, const char* param); #include "vobsub.h" /* FIXME */ -void mencoder_exit(int level, char *how) +static void mencoder_exit(int level, char *how) { if (how) printf("Exiting... (%s)\n", how); @@ -385,7 +385,7 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){ if(!parse_codec_cfg(NULL)){ mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf); - exit(0); + mencoder_exit(1,NULL); } mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_BuiltinCodecsConf); } @@ -804,7 +804,7 @@ if(audio_delay!=0.0){ } // if(sh_audio) printf(MSGTR_WritingAVIHeader); -muxer_write_header(muxer); +if (muxer->cont_write_header) muxer_write_header(muxer); decoded_frameno=0; @@ -1263,11 +1263,11 @@ if(sh_audio && mux_a->codec==ACODEC_VBRMP3 && !lame_param_vbr){ #endif printf(MSGTR_WritingAVIIndex); -muxer_write_index(muxer); +if (muxer->cont_write_index) muxer_write_index(muxer); muxer_f_size=ftello(muxer_f); printf(MSGTR_FixupAVIHeader); fseek(muxer_f,0,SEEK_SET); -muxer_write_header(muxer); // update header +if (muxer->cont_write_header) muxer_write_header(muxer); // update header if(ferror(muxer_f) || fclose(muxer_f) != 0) { mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ErrorWritingFile, out_filename); mencoder_exit(1, NULL); |