diff options
| author | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-10 01:45:34 +0000 |
|---|---|---|
| committer | anders <anders@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-10 01:45:34 +0000 |
| commit | 05c85403c4fb39643f1d0ab68e2d609fba9da5d7 (patch) | |
| tree | e97abec82e35f928c102dbfaaf4753f4bb85add3 /libaf/af_resample.c | |
| parent | e1718bed1926f2056fa77d6b15aa74a823b32fa0 (diff) | |
| download | mpv-05c85403c4fb39643f1d0ab68e2d609fba9da5d7.tar.bz2 mpv-05c85403c4fb39643f1d0ab68e2d609fba9da5d7.tar.xz | |
10l bug for float conversion control + feature fix in volume control
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8869 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf/af_resample.c')
| -rw-r--r-- | libaf/af_resample.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libaf/af_resample.c b/libaf/af_resample.c index 5c932fb3b3..06b224c983 100644 --- a/libaf/af_resample.c +++ b/libaf/af_resample.c @@ -279,14 +279,14 @@ static int control(struct af_instance_s* af, int cmd, void* arg) int rate=0; int type=RSMP_INT; int sloppy=1; - sscanf((char*)arg,"%i:%i:%i", &rate, &type, &sloppy); + sscanf((char*)arg,"%i:%i:%i", &rate, &sloppy, &type); s->setup = (sloppy?FREQ_SLOPPY:FREQ_EXACT) | (clamp(type,RSMP_LIN,RSMP_FLOAT)); return af->control(af,AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET, &rate); } case AF_CONTROL_POST_CREATE: if((((af_cfg_t*)arg)->force & AF_INIT_FORMAT_MASK) == AF_INIT_FLOAT) - ((af_resample_t*)af->setup)->setup |= RSMP_FLOAT; + ((af_resample_t*)af->setup)->setup = RSMP_FLOAT; return AF_OK; case AF_CONTROL_RESAMPLE_RATE | AF_CONTROL_SET: // Reinit must be called after this function has been called |