# HG changeset patch
# User diego
# Date 1283967532 0
# Node ID 9986a61354e6010acdcf7faf91931387f6b6940f
# Parent  09cd33b66ceb8e164529898445f4e5e2d8c52ba2
Remove duplicated audio_output_channels extern variable declaration.
It is already available in dec_audio.h, which is better suited.

diff -r 09cd33b66ceb -r 9986a61354e6 libmpcodecs/ad_dmo.c
--- a/libmpcodecs/ad_dmo.c	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_dmo.c	Wed Sep 08 17:38:52 2010 +0000
@@ -25,6 +25,7 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
+#include "dec_audio.h"
 #include "libaf/reorder_ch.h"
 
 static const ad_info_t info =
diff -r 09cd33b66ceb -r 9986a61354e6 libmpcodecs/ad_faad.c
--- a/libmpcodecs/ad_faad.c	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_faad.c	Wed Sep 08 17:38:52 2010 +0000
@@ -26,6 +26,7 @@
 
 #include "config.h"
 #include "ad_internal.h"
+#include "dec_audio.h"
 #include "libaf/reorder_ch.h"
 
 static const ad_info_t info =
diff -r 09cd33b66ceb -r 9986a61354e6 libmpcodecs/ad_ffmpeg.c
--- a/libmpcodecs/ad_ffmpeg.c	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_ffmpeg.c	Wed Sep 08 17:38:52 2010 +0000
@@ -25,6 +25,7 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
+#include "dec_audio.h"
 #include "vd_ffmpeg.h"
 #include "libaf/reorder_ch.h"
 
diff -r 09cd33b66ceb -r 9986a61354e6 libmpcodecs/ad_internal.h
--- a/libmpcodecs/ad_internal.h	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_internal.h	Wed Sep 08 17:38:52 2010 +0000
@@ -28,7 +28,6 @@
 
 #include "ad.h"
 
-extern int audio_output_channels;
 static int init(sh_audio_t *sh);
 static int preinit(sh_audio_t *sh);
 static void uninit(sh_audio_t *sh);
diff -r 09cd33b66ceb -r 9986a61354e6 libmpcodecs/ad_liba52.c
--- a/libmpcodecs/ad_liba52.c	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_liba52.c	Wed Sep 08 17:38:52 2010 +0000
@@ -30,6 +30,7 @@
 #include "mpbswap.h"
 
 #include "ad_internal.h"
+#include "dec_audio.h"
 
 #include "cpudetect.h"
 
diff -r 09cd33b66ceb -r 9986a61354e6 libmpcodecs/ad_libdca.c
--- a/libmpcodecs/ad_libdca.c	Wed Sep 08 17:31:29 2010 +0000
+++ b/libmpcodecs/ad_libdca.c	Wed Sep 08 17:38:52 2010 +0000
@@ -29,6 +29,7 @@
 
 #include "mp_msg.h"
 #include "ad_internal.h"
+#include "dec_audio.h"
 
 #include <dts.h>