From 586b75ad0840e154835ae67c7720b71bd36f8cc9 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 6 Apr 2013 01:02:45 +0200 Subject: 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. --- audio/decode/ad_lavc.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'audio/decode') 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 -- cgit v1.2.3