diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-11-21 22:53:14 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-11-21 22:53:14 +0000 |
| commit | 7a8f8317fd501364b3c76156189c2100d338097f (patch) | |
| tree | cb87cf317d3646b72ff50a0cb45d1a89142fd430 /mencoder.c | |
| parent | 76b842a3c1afc5385ac9dc060be99fae43121eaa (diff) | |
| download | mpv-7a8f8317fd501364b3c76156189c2100d338097f.tar.bz2 mpv-7a8f8317fd501364b3c76156189c2100d338097f.tar.xz | |
buffering in the muxer layer; patch by Corey Hickey (bugfood-ml ad fatooh punctum org) plus small fixes by me
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17024 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/mencoder.c b/mencoder.c index 892fa4e7a7..2a6dd432c9 100644 --- a/mencoder.c +++ b/mencoder.c @@ -833,8 +833,6 @@ if ((force_fourcc != NULL) && (strlen(force_fourcc) >= 4)) 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 @@ if(audio_delay_fix!=0.0){ 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 |