summaryrefslogtreecommitdiffstats
path: root/audio/decode
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-04-06 01:02:45 +0200
committerwm4 <wm4@nowhere>2013-05-12 21:24:55 +0200
commit586b75ad0840e154835ae67c7720b71bd36f8cc9 (patch)
treef125aefc72144ea1cce2d0ca62b0dd03bcb6d053 /audio/decode
parent408b7eecee2283a6e373cff03bb3156bd721632f (diff)
downloadmpv-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/decode')
-rw-r--r--audio/decode/ad_lavc.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 5c43c68d8a..8177d9cde6 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -451,13 +451,6 @@ static int decode_audio(sh_audio_t *sh_audio, unsigned char *buf, int minlen,
memcpy(buf, priv->output, size);
priv->output += size;
priv->output_left -= size;
- if (avctx->channels >= 5) {
- int samplesize = av_get_bytes_per_sample(avctx->sample_fmt);
- reorder_channel_nch(buf, AF_CHANNEL_LAYOUT_LAVC_DEFAULT,
- AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT,
- avctx->channels,
- size / samplesize, samplesize);
- }
if (len < 0)
len = size;
else