diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-27 17:30:15 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-27 17:30:15 +0000 |
commit | 507121f7fe2d170dd8db99d3112602036ddef718 (patch) | |
tree | 38b26e115cfadde356b005496286f78307839440 /libaf/af_volnorm.c | |
parent | 00f99a82a8f57573e3e6982cf9d014c9b9d8a68b (diff) | |
download | mpv-507121f7fe2d170dd8db99d3112602036ddef718.tar.bz2 mpv-507121f7fe2d170dd8db99d3112602036ddef718.tar.xz |
removing AFMT_ dependancy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf/af_volnorm.c')
-rw-r--r-- | libaf/af_volnorm.c | 10 |
1 files changed, 5 insertions, 5 deletions
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); |