diff options
author | wm4 <wm4@nowhere> | 2013-04-05 20:39:52 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-12 21:24:54 +0200 |
commit | 7971bb87cb46f90152913de6ac673ae3bd1637a3 (patch) | |
tree | 7929e829c5960425270f4f0c017d84c37872ac5b /audio/filter/af_tools.c | |
parent | f7a427676c0fe3c12509e3d9a243301f93626b0a (diff) | |
download | mpv-7971bb87cb46f90152913de6ac673ae3bd1637a3.tar.bz2 mpv-7971bb87cb46f90152913de6ac673ae3bd1637a3.tar.xz |
af: use mp_chmap for mp_audio, include channel map in format negotiation
Now af_lavrresample pretends to reorder the channels, although it
doesn't yet, and nothing sets non-standard layouts either.
Diffstat (limited to 'audio/filter/af_tools.c')
-rw-r--r-- | audio/filter/af_tools.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/filter/af_tools.c b/audio/filter/af_tools.c index 22534cda8d..77fdad55f2 100644 --- a/audio/filter/af_tools.c +++ b/audio/filter/af_tools.c @@ -90,7 +90,7 @@ int af_test_output(struct af_instance* af, struct mp_audio* out) if((af->data->format != out->format) || (af->data->bps != out->bps) || (af->data->rate != out->rate) || - (af->data->nch != out->nch)){ + !mp_chmap_equals(&af->data->channels, &out->channels)){ *out = *af->data; return AF_FALSE; } |