diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-07-22 21:27:54 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-07-22 21:27:54 +0000 |
| commit | 2affcd2e6140ddcc99d9c933d8e6fe9e3f68ebb7 (patch) | |
| tree | 94829d929e798e8aecd2277b7be116c89039abcf /mencoder.c | |
| parent | f2ea1e7d6b14b9bcbf42c34b5ac9ea2d7fb55a37 (diff) | |
| download | mpv-2affcd2e6140ddcc99d9c933d8e6fe9e3f68ebb7.tar.bz2 mpv-2affcd2e6140ddcc99d9c933d8e6fe9e3f68ebb7.tar.xz | |
fix invalid pointers passed to init_audio_filters
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16061 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mencoder.c b/mencoder.c index f65e768a1b..11d56bb75a 100644 --- a/mencoder.c +++ b/mencoder.c @@ -986,12 +986,15 @@ else if (sh_audio) { } break; } - if (do_init_filters) if(!init_audio_filters(sh_audio, + if (do_init_filters) { + int out_srate = mux_a->wf->nSamplesPerSec; + int out_channels = mux_a->wf->nChannels; + if(!init_audio_filters(sh_audio, new_srate, sh_audio->channels, sh_audio->sample_format, - &mux_a->wf->nSamplesPerSec, - &mux_a->wf->nChannels, + &out_srate, + &out_channels, &out_format, out_minsize, out_maxsize)) @@ -999,6 +1002,9 @@ else if (sh_audio) { mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoMatchingFilter); mencoder_exit(1, NULL); } + mux_a->wf->nSamplesPerSec = out_srate; + mux_a->wf->nChannels = out_channels; + } } parse_end_at(); |