[MPlayer-cvslog] r32070 - in trunk/libmpcodecs: ad_dmo.c ad_faad.c ad_ffmpeg.c ad_internal.h ad_liba52.c ad_libdca.c

[diego]

Author: diego
Date: Wed Sep  8 19:38:52 2010
New Revision: 32070

Log:
Remove duplicated audio_output_channels extern variable declaration.
It is already available in dec_audio.h, which is better suited.

Modified:
   trunk/libmpcodecs/ad_dmo.c
   trunk/libmpcodecs/ad_faad.c
   trunk/libmpcodecs/ad_ffmpeg.c
   trunk/libmpcodecs/ad_internal.h
   trunk/libmpcodecs/ad_liba52.c
   trunk/libmpcodecs/ad_libdca.c

Modified: trunk/libmpcodecs/ad_dmo.c
==============================================================================
--- trunk/libmpcodecs/ad_dmo.c	Wed Sep  8 19:31:29 2010	(r32069)
+++ trunk/libmpcodecs/ad_dmo.c	Wed Sep  8 19:38:52 2010	(r32070)
@@ -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 =

Modified: trunk/libmpcodecs/ad_faad.c
==============================================================================
--- trunk/libmpcodecs/ad_faad.c	Wed Sep  8 19:31:29 2010	(r32069)
+++ trunk/libmpcodecs/ad_faad.c	Wed Sep  8 19:38:52 2010	(r32070)
@@ -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 =

Modified: trunk/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/ad_ffmpeg.c	Wed Sep  8 19:31:29 2010	(r32069)
+++ trunk/libmpcodecs/ad_ffmpeg.c	Wed Sep  8 19:38:52 2010	(r32070)
@@ -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"
 

Modified: trunk/libmpcodecs/ad_internal.h
==============================================================================
--- trunk/libmpcodecs/ad_internal.h	Wed Sep  8 19:31:29 2010	(r32069)
+++ trunk/libmpcodecs/ad_internal.h	Wed Sep  8 19:38:52 2010	(r32070)
@@ -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);

Modified: trunk/libmpcodecs/ad_liba52.c
==============================================================================
--- trunk/libmpcodecs/ad_liba52.c	Wed Sep  8 19:31:29 2010	(r32069)
+++ trunk/libmpcodecs/ad_liba52.c	Wed Sep  8 19:38:52 2010	(r32070)
@@ -30,6 +30,7 @@
 #include "mpbswap.h"
 
 #include "ad_internal.h"
+#include "dec_audio.h"
 
 #include "cpudetect.h"
 

Modified: trunk/libmpcodecs/ad_libdca.c
==============================================================================
--- trunk/libmpcodecs/ad_libdca.c	Wed Sep  8 19:31:29 2010	(r32069)
+++ trunk/libmpcodecs/ad_libdca.c	Wed Sep  8 19:38:52 2010	(r32070)
@@ -29,6 +29,7 @@
 
 #include "mp_msg.h"
 #include "ad_internal.h"
+#include "dec_audio.h"
 
 #include <dts.h>