diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-30 15:23:25 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-30 15:23:25 +0000 |
commit | aac28cfe4c0029c7908b5c9c2c50f0d273dc1a1c (patch) | |
tree | d27d81a0e3759e67a9506a5cac570556fdad49a6 /libmpcodecs | |
parent | 80e0ec3e105274729216ee97789d9debd0d7cc92 (diff) | |
download | mpv-aac28cfe4c0029c7908b5c9c2c50f0d273dc1a1c.tar.bz2 mpv-aac28cfe4c0029c7908b5c9c2c50f0d273dc1a1c.tar.xz |
Move extern int audio_output_channels; to ad_internal.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23938 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_dmo.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_faad.c | 1 | ||||
-rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 1 | ||||
-rw-r--r-- | libmpcodecs/ad_internal.h | 1 | ||||
-rw-r--r-- | libmpcodecs/ad_liba52.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_libdca.c | 3 |
6 files changed, 1 insertions, 9 deletions
diff --git a/libmpcodecs/ad_dmo.c b/libmpcodecs/ad_dmo.c index 5215945c82..33171c684e 100644 --- a/libmpcodecs/ad_dmo.c +++ b/libmpcodecs/ad_dmo.c @@ -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; diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index 98be24df66..7e2fb384a6 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -64,7 +64,6 @@ static int aac_probe(unsigned char *buffer, int len) return pos; } -extern int audio_output_channels; static int init(sh_audio_t *sh) { unsigned long faac_samplerate; diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index d4a729a192..f5c289c301 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -7,7 +7,6 @@ #include "help_mp.h" #include "ad_internal.h" -extern int audio_output_channels; #include "mpbswap.h" diff --git a/libmpcodecs/ad_internal.h b/libmpcodecs/ad_internal.h index 5e579ce35a..5dd3122d96 100644 --- a/libmpcodecs/ad_internal.h +++ b/libmpcodecs/ad_internal.h @@ -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 --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index c9c7b9c69f..5739e093a0 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -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; diff --git a/libmpcodecs/ad_libdca.c b/libmpcodecs/ad_libdca.c index 3e4ea21dc3..6e5ef98a88 100644 --- a/libmpcodecs/ad_libdca.c +++ b/libmpcodecs/ad_libdca.c @@ -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; |