summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-09-22 21:08:59 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:18:07 +0200
commit65e3208b1aa2d4eecc6b7cb1cf4e04b454aa41fc (patch)
treecb30ca42a09378c08c44b59a3ef036995fb23f1b
parent4c904953b5c9250d814092591a8396165bc9b5c5 (diff)
downloadmpv-65e3208b1aa2d4eecc6b7cb1cf4e04b454aa41fc.tar.bz2
mpv-65e3208b1aa2d4eecc6b7cb1cf4e04b454aa41fc.tar.xz
libfaad2: make a function static
Mark output_to_PCM_sux as static, it is not used outside of the file; fixes: libfaad2/output.c:465: warning: no previous prototype for 'output_to_PCM_sux' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32343 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libfaad2/local_changes.diff12
-rw-r--r--libfaad2/output.c6
2 files changed, 11 insertions, 7 deletions
diff --git a/libfaad2/local_changes.diff b/libfaad2/local_changes.diff
index 30b3bb74ba..d24cab1c72 100644
--- a/libfaad2/local_changes.diff
+++ b/libfaad2/local_changes.diff
@@ -99,15 +99,19 @@
#error
--- libfaad2.orig/output.c 2006-03-16 20:15:04.000000000 +0100
+++ libfaad2/output.c 2006-04-18 19:50:26.000000000 +0200
-@@ -463,7 +462,7 @@
+@@ -463,9 +462,9 @@
}
}
-void* output_to_PCM(NeAACDecHandle hDecoder,
-+void* output_to_PCM_sux(NeAACDecHandle hDecoder,
- real_t **input, void *sample_buffer, uint8_t channels,
- uint16_t frame_len, uint8_t format)
+- real_t **input, void *sample_buffer, uint8_t channels,
+- uint16_t frame_len, uint8_t format)
++static void* output_to_PCM_sux(NeAACDecHandle hDecoder,
++ real_t **input, void *sample_buffer, uint8_t channels,
++ uint16_t frame_len, uint8_t format)
{
+ uint8_t ch;
+ uint16_t i;
@@ -554,4 +553,51 @@
return sample_buffer;
}
diff --git a/libfaad2/output.c b/libfaad2/output.c
index a8c41b8941..dde71de129 100644
--- a/libfaad2/output.c
+++ b/libfaad2/output.c
@@ -462,9 +462,9 @@ static INLINE real_t get_sample(real_t **input, uint8_t channel, uint16_t sample
}
}
-void* output_to_PCM_sux(NeAACDecHandle hDecoder,
- real_t **input, void *sample_buffer, uint8_t channels,
- uint16_t frame_len, uint8_t format)
+static void* output_to_PCM_sux(NeAACDecHandle hDecoder,
+ real_t **input, void *sample_buffer, uint8_t channels,
+ uint16_t frame_len, uint8_t format)
{
uint8_t ch;
uint16_t i;