diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-03 18:59:16 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-01-03 18:59:16 +0000 |
| commit | c7ef86b09afac434bdc3d9a3661d20163b7d84d7 (patch) | |
| tree | ee9f797012ee4db4b4d7964b556951c2987991c0 /libaf/af.c | |
| parent | ba393c56049e529e5948d452e8cef97b540c4f51 (diff) | |
| download | mpv-c7ef86b09afac434bdc3d9a3661d20163b7d84d7.tar.bz2 mpv-c7ef86b09afac434bdc3d9a3661d20163b7d84d7.tar.xz | |
af_bits2fmt and af_str2fmt_short, also removed the extra FORMAT_BPS control in format.c
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14336 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libaf/af.c')
| -rw-r--r-- | libaf/af.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libaf/af.c b/libaf/af.c index 05f271f668..2165eb3baf 100644 --- a/libaf/af.c +++ b/libaf/af.c @@ -270,8 +270,8 @@ int af_reinit(af_stream_t* s, af_instance_t* af) if(NULL == (new = af_prepend(s,af,"format"))) return AF_ERROR; // Set output bits per sample - if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_BPS,&in.bps)) || - AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_FMT,&in.format))) + in.format |= af_bits2fmt(in.bps*8); + if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_FMT,&in.format))) return rv; // Initialize format filter if(!new->prev) @@ -444,8 +444,8 @@ int af_init(af_stream_t* s, int force_output) else af = s->last; // Init the new filter - if(!af ||(AF_OK != af->control(af,AF_CONTROL_FORMAT_BPS,&(s->output.bps))) - || (AF_OK != af->control(af,AF_CONTROL_FORMAT_FMT,&(s->output.format)))) + s->output.format |= af_bits2fmt(s->output.bps*8); + if(!af || (AF_OK != af->control(af,AF_CONTROL_FORMAT_FMT,&(s->output.format)))) return -1; if(AF_OK != af_reinit(s,af)) return -1; |