# HG changeset patch # User reimar # Date 1185809005 0 # Node ID f29d31547c31cff633e5440cae0d64fdde97566a # Parent c23bbfc21ef61097d43fd2de4e8959826ec91049 Move extern int audio_output_channels; to ad_internal.h diff -r c23bbfc21ef6 -r f29d31547c31 libmpcodecs/ad_dmo.c --- 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; diff -r c23bbfc21ef6 -r f29d31547c31 libmpcodecs/ad_faad.c --- 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; diff -r c23bbfc21ef6 -r f29d31547c31 libmpcodecs/ad_ffmpeg.c --- 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" diff -r c23bbfc21ef6 -r f29d31547c31 libmpcodecs/ad_internal.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); diff -r c23bbfc21ef6 -r f29d31547c31 libmpcodecs/ad_liba52.c --- 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; diff -r c23bbfc21ef6 -r f29d31547c31 libmpcodecs/ad_libdca.c --- 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;