diff options
| author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-25 22:49:36 +0000 |
|---|---|---|
| committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-25 22:49:36 +0000 |
| commit | 9699d2dcec9fa027bff382dab80930fba9b3b347 (patch) | |
| tree | 895827f39ab1597f1ee2cca0bb2db0371471aaa7 /mencoder.c | |
| parent | a8697788c280a1431d9b6d201d980df7f34c18c1 (diff) | |
| download | mpv-9699d2dcec9fa027bff382dab80930fba9b3b347.tar.bz2 mpv-9699d2dcec9fa027bff382dab80930fba9b3b347.tar.xz | |
cleanups of the Multiple files patch
by Oded Shimon <ods15@ods15.dyndns.org>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14828 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mencoder.c b/mencoder.c index 4d1e66f5ed..24c9eb913c 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1172,7 +1172,7 @@ signal(SIGTERM,exit_sighandler); // kill timer_start=GetTimerMS(); } // if (!curfile) // if this was the first file. else if (sh_audio) { - int out_format, out_bps, out_minsize, out_maxsize; + int out_format = 0, out_minsize = 0, out_maxsize = 0; int do_init_filters = 1; switch(mux_a->codec){ case ACODEC_COPY: @@ -1209,7 +1209,6 @@ else if (sh_audio) { case ACODEC_PCM: mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_CBRPCMAudioSelected); out_format = (mux_a->wf->wBitsPerSample==8) ? AF_FORMAT_U8 : AF_FORMAT_S16_LE; - out_bps = mux_a->wf->wBitsPerSample/8; out_minsize = 16384; out_maxsize = mux_a->wf->nAvgBytesPerSec; break; @@ -1217,7 +1216,6 @@ else if (sh_audio) { case ACODEC_VBRMP3: mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_MP3AudioSelected); out_format = AF_FORMAT_S16_NE; - out_bps = 2; out_minsize = 4608; out_maxsize = mux_a->h.dwRate*mux_a->wf->nChannels*2; break; @@ -1225,7 +1223,6 @@ else if (sh_audio) { #ifdef USE_LIBAVCODEC case ACODEC_LAVC: out_format = AF_FORMAT_S16_NE; - out_bps = 2; out_minsize = mux_a->h.dwSuggestedBufferSize; out_maxsize = mux_a->h.dwSuggestedBufferSize*2; mp_msg(MSGT_MENCODER, MSGL_V, "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n", @@ -1235,7 +1232,6 @@ else if (sh_audio) { #ifdef HAVE_TOOLAME case ACODEC_TOOLAME: out_format = AF_FORMAT_S16_NE; - out_bps = 2; out_minsize = mux_a->h.dwSuggestedBufferSize; out_maxsize = mux_a->h.dwSuggestedBufferSize*2; break; @@ -1247,9 +1243,9 @@ else if (sh_audio) { sh_audio->sample_format, mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, - AF_FORMAT_S16_NE, - 4608, - mux_a->h.dwRate*mux_a->wf->nChannels*2)) + out_format, + out_minsize, + out_maxsize)) { mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoMatchingFilter); exit(1); |