[MPlayer-cvslog] r31468 - in trunk: cfg-common.h libmpcodecs/dec_audio.h

[diego]

Author: diego
Date: Fri Jun 18 19:06:39 2010
New Revision: 31468

Log:
Move audio_output_channels/fakemono extern variable declarations to dec_audio.h.

Modified:
   trunk/cfg-common.h
   trunk/libmpcodecs/dec_audio.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Fri Jun 18 19:03:13 2010	(r31467)
+++ trunk/cfg-common.h	Fri Jun 18 19:06:39 2010	(r31468)
@@ -26,6 +26,7 @@
 #include "mp_msg.h"
 
 #include "libmpcodecs/ad.h"
+#include "libmpcodecs/dec_audio.h"
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/vd.h"
 #include "libmpdemux/demux_ts.h"
@@ -33,10 +34,6 @@
 #include "stream/network.h"
 #include "codec-cfg.h"
 
-/* from dec_audio, currently used for ac3surround decoder only */
-extern int audio_output_channels;
-extern int fakemono;
-
 extern int network_prefer_ipv4;
 extern int reuse_socket;
 

Modified: trunk/libmpcodecs/dec_audio.h
==============================================================================
--- trunk/libmpcodecs/dec_audio.h	Fri Jun 18 19:03:13 2010	(r31467)
+++ trunk/libmpcodecs/dec_audio.h	Fri Jun 18 19:06:39 2010	(r31468)
@@ -21,6 +21,9 @@
 
 #include "libmpdemux/stheader.h"
 
+extern int audio_output_channels;
+extern int fakemono;
+
 // dec_audio.c:
 void afm_help(void);
 int init_best_audio_codec(sh_audio_t *sh_audio, char** audio_codec_list, char** audio_fm_list);