Mercurial > mplayer.hg

changeset 23918:f29d31547c31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move extern int audio_output_channels; to ad_internal.h
author reimar
date Mon, 30 Jul 2007 15:23:25 +0000
parents c23bbfc21ef6
children 440d23a28592
files libmpcodecs/ad_dmo.c libmpcodecs/ad_faad.c libmpcodecs/ad_ffmpeg.c libmpcodecs/ad_internal.h libmpcodecs/ad_liba52.c libmpcodecs/ad_libdca.c
diffstat 6 files changed, 1 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/ad_dmo.c	Mon Jul 30 15:19:35 2007 +0000
+++ b/libmpcodecs/ad_dmo.c	Mon Jul 30 15:23:25 2007 +0000
@@ -26,8 +26,6 @@
   return 1;
 }
 
-extern int audio_output_channels;
-
 static int preinit(sh_audio_t *sh_audio)
 {
   DMO_AudioDecoder* ds_adec;
--- a/libmpcodecs/ad_faad.c	Mon Jul 30 15:19:35 2007 +0000
+++ b/libmpcodecs/ad_faad.c	Mon Jul 30 15:23:25 2007 +0000
@@ -64,7 +64,6 @@
   return pos;
 }
 	
-extern int audio_output_channels;
 static int init(sh_audio_t *sh)
 {
   unsigned long faac_samplerate;
--- a/libmpcodecs/ad_ffmpeg.c	Mon Jul 30 15:19:35 2007 +0000
+++ b/libmpcodecs/ad_ffmpeg.c	Mon Jul 30 15:23:25 2007 +0000
@@ -7,7 +7,6 @@
 #include "help_mp.h"
 
 #include "ad_internal.h"
-extern int audio_output_channels;
 
 #include "mpbswap.h"
 
--- a/libmpcodecs/ad_internal.h	Mon Jul 30 15:19:35 2007 +0000
+++ b/libmpcodecs/ad_internal.h	Mon Jul 30 15:23:25 2007 +0000
@@ -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);
--- a/libmpcodecs/ad_liba52.c	Mon Jul 30 15:19:35 2007 +0000
+++ b/libmpcodecs/ad_liba52.c	Mon Jul 30 15:23:25 2007 +0000
@@ -51,8 +51,6 @@
 
 LIBAD_EXTERN(liba52)
 
-extern int audio_output_channels;
-
 int a52_fillbuff(sh_audio_t *sh_audio){
 int length=0;
 int flags=0;
--- a/libmpcodecs/ad_libdca.c	Mon Jul 30 15:19:35 2007 +0000
+++ b/libmpcodecs/ad_libdca.c	Mon Jul 30 15:23:25 2007 +0000
@@ -58,9 +58,6 @@
     DTS_3F2R | DTS_LFE
 };
 
-extern int audio_output_channels;
-
-
 static inline int16_t convert(sample_t s)
 {
     int i = s * 0x7fff;