[Mplayer-cvslog] CVS: main mencoder.c,1.218,1.219 mp_msg.h,1.28,1.29

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv18546

Modified Files:
	mencoder.c mp_msg.h 
Log Message:
some updates in muxer api

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- mencoder.c	13 Aug 2003 16:29:00 -0000	1.218
+++ mencoder.c	22 Oct 2003 17:04:15 -0000	1.219
@@ -232,7 +232,7 @@
 #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(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(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 @@
 #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);

Index: mp_msg.h
===================================================================
RCS file: /cvsroot/mplayer/main/mp_msg.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- mp_msg.h	31 Aug 2003 19:15:33 -0000	1.28
+++ mp_msg.h	22 Oct 2003 17:04:15 -0000	1.29
@@ -85,6 +85,8 @@
 
 #define MSGT_NETST 38 // Netstream
 
+#define MSGT_MUXER 39 // muxer layer
+
 #define MSGT_MAX 64
 
 void mp_msg_init();