diff options
author | wm4 <wm4@nowhere> | 2013-04-06 01:02:45 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-12 21:24:55 +0200 |
commit | 586b75ad0840e154835ae67c7720b71bd36f8cc9 (patch) | |
tree | f125aefc72144ea1cce2d0ca62b0dd03bcb6d053 /audio/filter/af_lavcac3enc.c | |
parent | 408b7eecee2283a6e373cff03bb3156bd721632f (diff) | |
download | mpv-586b75ad0840e154835ae67c7720b71bd36f8cc9.tar.bz2 mpv-586b75ad0840e154835ae67c7720b71bd36f8cc9.tar.xz |
reorder_ch: remove old channel reorder functions
This is done in af_lavrresample now, and as part of format negotiation.
Also remove the remaining reorder_channel calls. They were redundant
and did nothing.
Diffstat (limited to 'audio/filter/af_lavcac3enc.c')
-rw-r--r-- | audio/filter/af_lavcac3enc.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/audio/filter/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c index b4b4fd4a1d..7eacc01d81 100644 --- a/audio/filter/af_lavcac3enc.c +++ b/audio/filter/af_lavcac3enc.c @@ -233,15 +233,6 @@ static struct mp_audio* play(struct af_instance* af, struct mp_audio* data) src2= s->pending_data; } - if (c->nch >= 5) { - reorder_channel_nch(src2, - AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, - AF_CHANNEL_LAYOUT_LAVC_DEFAULT, - c->nch, - s->expect_len / samplesize, - samplesize); - } - void *data = (void *) src2; if (s->planarize) { void *data2 = malloc(s->expect_len); |