[MPlayer-cvslog] CVS: main cfg-mencoder.h, 1.90, 1.91 mencoder.c, 1.262, 1.263

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv26607

Modified Files:
	cfg-mencoder.h mencoder.c 
Log Message:
initial, extremely experimental, libavformat muxer; don't expect anything to work yet

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- cfg-mencoder.h	21 Feb 2005 21:45:48 -0000	1.90
+++ cfg-mencoder.h	21 Feb 2005 23:18:31 -0000	1.91
@@ -73,6 +73,9 @@
 
 extern m_option_t nuvopts_conf[];
 extern m_option_t mpegopts_conf[];
+#ifdef USE_LIBAVFORMAT
+extern m_option_t lavfopts_conf[];
+#endif
 
 m_option_t ovc_conf[]={
 	{"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY, NULL},
@@ -177,6 +180,9 @@
 m_option_t of_conf[]={
 	{"avi", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_AVI, NULL},
 	{"mpeg", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_MPEG, NULL},
+#ifdef USE_LIBAVFORMAT
+	{"lavf", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_LAVF, NULL},
+#endif
 	{"rawvideo", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_RAWVIDEO, NULL},
 	{"help", "\nAvailable output formats:\n"
 	"   avi      - Microsoft Audio/Video Interleaved\n"
@@ -271,6 +277,9 @@
 
 	{"nuvopts",  nuvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 	{"mpegopts",  mpegopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+#ifdef USE_LIBAVFORMAT
+	{"lavfopts",  lavfopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
+#endif	
 
 #define MAIN_CONF
 #include "cfg-common.h"

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- mencoder.c	12 Feb 2005 15:11:02 -0000	1.262
+++ mencoder.c	21 Feb 2005 23:18:31 -0000	1.263
@@ -746,6 +746,8 @@
 	mux_v->bih->biCompression, (char *)&mux_v->bih->biCompression);
 }
 
+if(muxer->fix_stream_parameters)
+	  muxer_stream_fix_parameters(muxer,mux_v);
 //if(demuxer->file_format!=DEMUXER_TYPE_AVI) pts_from_bps=0; // it must be 0 for mpeg/asf!
 
 // ============= AUDIO ===============
@@ -1062,6 +1064,8 @@
     mux_a->h.dwStart=audio_delay*mux_a->h.dwRate/mux_a->h.dwScale;
     mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_SettingAudioDelay,mux_a->h.dwStart*mux_a->h.dwScale/(float)mux_a->h.dwRate);
 }
+if(muxer->fix_stream_parameters)
+	  muxer_stream_fix_parameters(muxer,mux_a);
 
 } // if(sh_audio)