From 507121f7fe2d170dd8db99d3112602036ddef718 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 27 Dec 2004 17:30:15 +0000 Subject: removing AFMT_ dependancy git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libaf/af_volnorm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libaf/af_volnorm.c') diff --git a/libaf/af_volnorm.c b/libaf/af_volnorm.c index c1fed6a9d3..60485118b0 100644 --- a/libaf/af_volnorm.c +++ b/libaf/af_volnorm.c @@ -79,11 +79,11 @@ static int control(struct af_instance_s* af, int cmd, void* arg) af->data->rate = ((af_data_t*)arg)->rate; af->data->nch = ((af_data_t*)arg)->nch; - if(((af_data_t*)arg)->format == (AF_FORMAT_SI | AF_FORMAT_NE)){ - af->data->format = AF_FORMAT_SI | AF_FORMAT_NE; + if(((af_data_t*)arg)->format == (AF_FORMAT_S16_NE)){ + af->data->format = AF_FORMAT_S16_NE; af->data->bps = 2; }else{ - af->data->format = AF_FORMAT_F | AF_FORMAT_NE; + af->data->format = AF_FORMAT_FLOAT_NE; af->data->bps = 4; } return af_test_output(af,(af_data_t*)arg); @@ -288,14 +288,14 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) { af_volnorm_t *s = af->setup; - if(af->data->format == (AF_FORMAT_SI | AF_FORMAT_NE)) + if(af->data->format == (AF_FORMAT_S16_NE)) { if (s->method) method2_int16(s, data); else method1_int16(s, data); } - else if(af->data->format == (AF_FORMAT_F | AF_FORMAT_NE)) + else if(af->data->format == (AF_FORMAT_FLOAT_NE)) { if (s->method) method2_float(s, data); -- cgit v1.2.3