Mercurial > mplayer.hg
comparison mencoder.c @ 16060:f3a003167683
fix invalid pointers passed to init_audio_filters
author | reimar |
---|---|
date | Fri, 22 Jul 2005 21:27:54 +0000 |
parents | 0ccf19820216 |
children | f0d22e076a7d |
comparison
equal
deleted
inserted
replaced
16059:10d44bf6647e | 16060:f3a003167683 |
---|---|
984 } | 984 } |
985 | 985 |
986 } | 986 } |
987 break; | 987 break; |
988 } | 988 } |
989 if (do_init_filters) if(!init_audio_filters(sh_audio, | 989 if (do_init_filters) { |
990 int out_srate = mux_a->wf->nSamplesPerSec; | |
991 int out_channels = mux_a->wf->nChannels; | |
992 if(!init_audio_filters(sh_audio, | |
990 new_srate, | 993 new_srate, |
991 sh_audio->channels, | 994 sh_audio->channels, |
992 sh_audio->sample_format, | 995 sh_audio->sample_format, |
993 &mux_a->wf->nSamplesPerSec, | 996 &out_srate, |
994 &mux_a->wf->nChannels, | 997 &out_channels, |
995 &out_format, | 998 &out_format, |
996 out_minsize, | 999 out_minsize, |
997 out_maxsize)) | 1000 out_maxsize)) |
998 { | 1001 { |
999 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoMatchingFilter); | 1002 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoMatchingFilter); |
1000 mencoder_exit(1, NULL); | 1003 mencoder_exit(1, NULL); |
1004 } | |
1005 mux_a->wf->nSamplesPerSec = out_srate; | |
1006 mux_a->wf->nChannels = out_channels; | |
1001 } | 1007 } |
1002 } | 1008 } |
1003 | 1009 |
1004 parse_end_at(); | 1010 parse_end_at(); |
1005 | 1011 |