[MPlayer-cvslog] CVS: main AUTHORS, 1.165, 1.166 mencoder.c, 1.319, 1.320
Nico Sabbi CVS
syncmail at mplayerhq.hu
Mon Nov 21 23:53:16 CET 2005
- Previous message: [MPlayer-cvslog] CVS: main/libmpdemux muxer.c, 1.10, 1.11 muxer.h, 1.15, 1.16 muxer_avi.c, 1.31, 1.32 muxer_lavf.c, 1.12, 1.13 muxer_mpeg.c, 1.22, 1.23 muxer_rawaudio.c, 1.2, 1.3 muxer_rawvideo.c, 1.5, 1.6
- Next message: [MPlayer-cvslog] CVS: main AUTHORS, 1.165, 1.166 mencoder.c, 1.319, 1.320
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
CVS change done by Nico Sabbi CVS
Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv4140
Modified Files:
AUTHORS mencoder.c
Log Message:
buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh punctum org) plus small fixes by me
Index: AUTHORS
===================================================================
RCS file: /cvsroot/mplayer/main/AUTHORS,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- AUTHORS 5 Nov 2005 11:58:24 -0000 1.165
+++ AUTHORS 21 Nov 2005 22:53:14 -0000 1.166
@@ -343,6 +343,7 @@
Hickey, Corey <bugfood-ml at fatooh.org>
* telecine/interlacing HOWTO for the MEncoder documentation
* advanced audio usage guide for the MPlayer documentation
+ * muxer frame buffer for MEncoder
Hidvégi, Zoltán (Zoli) <mplayer at hzoli.com>
* filmdint video filter
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -r1.319 -r1.320
--- mencoder.c 17 Nov 2005 19:17:53 -0000 1.319
+++ mencoder.c 21 Nov 2005 22:53:14 -0000 1.320
@@ -833,8 +833,6 @@
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 ===============
@@ -933,14 +931,9 @@
mux_a->h.dwStart=audio_delay_fix*mux_a->h.dwRate/mux_a->h.dwScale;
mp_msg(MSGT_MENCODER, MSGL_INFO, 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)
-mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_WritingAVIHeader);
-if (muxer->cont_write_header) muxer_write_header(muxer);
-
decoded_frameno=0;
signal(SIGINT,exit_sighandler); // Interrupt from keyboard
- Previous message: [MPlayer-cvslog] CVS: main/libmpdemux muxer.c, 1.10, 1.11 muxer.h, 1.15, 1.16 muxer_avi.c, 1.31, 1.32 muxer_lavf.c, 1.12, 1.13 muxer_mpeg.c, 1.22, 1.23 muxer_rawaudio.c, 1.2, 1.3 muxer_rawvideo.c, 1.5, 1.6
- Next message: [MPlayer-cvslog] CVS: main AUTHORS, 1.165, 1.166 mencoder.c, 1.319, 1.320
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the MPlayer-cvslog
mailing list