From c7e620df96630b4e254040087f37a553bc1988df Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Sun, 16 Mar 2014 09:49:34 +0100
Subject: af_lavrresample: remove avresample_set_channel_mapping() fallbacks

This function is now always available.

Also remove includes of reorder_ch.h from some AOs (these are just old
relicts).
---
 audio/out/ao_alsa.c   | 1 -
 audio/out/ao_dsound.c | 1 -
 audio/out/ao_pcm.c    | 1 -
 3 files changed, 3 deletions(-)

(limited to 'audio/out')

diff --git a/audio/out/ao_alsa.c b/audio/out/ao_alsa.c
index 9b53a3af2f..63cba45aac 100644
--- a/audio/out/ao_alsa.c
+++ b/audio/out/ao_alsa.c
@@ -48,7 +48,6 @@
 #include "ao.h"
 #include "internal.h"
 #include "audio/format.h"
-#include "audio/reorder_ch.h"
 
 struct priv {
     snd_pcm_t *alsa;
diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c
index 6ddf080d20..aba4d882dc 100644
--- a/audio/out/ao_dsound.c
+++ b/audio/out/ao_dsound.c
@@ -39,7 +39,6 @@
 #include "audio/format.h"
 #include "ao.h"
 #include "internal.h"
-#include "audio/reorder_ch.h"
 #include "common/msg.h"
 #include "osdep/timer.h"
 #include "options/m_option.h"
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index b14c9f4d79..ab5faf6173 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -32,7 +32,6 @@
 
 #include "options/m_option.h"
 #include "audio/format.h"
-#include "audio/reorder_ch.h"
 #include "ao.h"
 #include "internal.h"
 #include "common/msg.h"
-- 
cgit v1.2.3