changeset 31402:c9e6eb55607e

Move audio_output_channels/fakemono extern variable declarations to dec_audio.h.
author diego
date Fri, 18 Jun 2010 17:06:39 +0000
parents 262d9759bfc5
children 6fccaae78d5b
files cfg-common.h libmpcodecs/dec_audio.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-common.h	Fri Jun 18 17:03:13 2010 +0000
+++ b/cfg-common.h	Fri Jun 18 17:06:39 2010 +0000
@@ -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;
 
--- a/libmpcodecs/dec_audio.h	Fri Jun 18 17:03:13 2010 +0000
+++ b/libmpcodecs/dec_audio.h	Fri Jun 18 17:06:39 2010 +0000
@@ -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);