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

[reimar]

Author: reimar
Date: Mon Jul 30 17:23:25 2007
New Revision: 23938

Log:
Move extern int audio_output_channels; to ad_internal.h


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	(original)
+++ trunk/libmpcodecs/ad_dmo.c	Mon Jul 30 17:23:25 2007
@@ -26,8 +26,6 @@ static int init(sh_audio_t *sh)
   return 1;
 }
 
-extern int audio_output_channels;
-
 static int preinit(sh_audio_t *sh_audio)
 {
   DMO_AudioDecoder* ds_adec;

Modified: trunk/libmpcodecs/ad_faad.c
==============================================================================
--- trunk/libmpcodecs/ad_faad.c	(original)
+++ trunk/libmpcodecs/ad_faad.c	Mon Jul 30 17:23:25 2007
@@ -64,7 +64,6 @@ static int aac_probe(unsigned char *buff
   return pos;
 }
 	
-extern int audio_output_channels;
 static int init(sh_audio_t *sh)
 {
   unsigned long faac_samplerate;

Modified: trunk/libmpcodecs/ad_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/ad_ffmpeg.c	(original)
+++ trunk/libmpcodecs/ad_ffmpeg.c	Mon Jul 30 17:23:25 2007
@@ -7,7 +7,6 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
-extern int audio_output_channels;
 
 #include "mpbswap.h"
 

Modified: trunk/libmpcodecs/ad_internal.h
==============================================================================
--- trunk/libmpcodecs/ad_internal.h	(original)
+++ trunk/libmpcodecs/ad_internal.h	Mon Jul 30 17:23:25 2007
@@ -8,6 +8,7 @@
 
 #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	(original)
+++ trunk/libmpcodecs/ad_liba52.c	Mon Jul 30 17:23:25 2007
@@ -51,8 +51,6 @@ static ad_info_t info = 
 
 LIBAD_EXTERN(liba52)
 
-extern int audio_output_channels;
-
 int a52_fillbuff(sh_audio_t *sh_audio){
 int length=0;
 int flags=0;

Modified: trunk/libmpcodecs/ad_libdca.c
==============================================================================
--- trunk/libmpcodecs/ad_libdca.c	(original)
+++ trunk/libmpcodecs/ad_libdca.c	Mon Jul 30 17:23:25 2007
@@ -58,9 +58,6 @@ static const char ch2flags[6] = {
     DTS_3F2R | DTS_LFE
 };
 
-extern int audio_output_channels;
-
-
 static inline int16_t convert(sample_t s)
 {
     int i = s * 0x7fff;