summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-05 21:44:42 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-05 21:44:42 +0000
commit980239fa82e68fad023f752c57d5749b3fc7af82 (patch)
tree38dd2701a9ad228cc94b140e951edd6ff05a43a9 /libmpdemux
parent8ecc4934ef77c0b9e4455e00fcd91574ca4c2aeb (diff)
downloadmpv-980239fa82e68fad023f752c57d5749b3fc7af82.tar.bz2
mpv-980239fa82e68fad023f752c57d5749b3fc7af82.tar.xz
Move find_backwards_asf_guid asfguid.h to asfheader.c, the only place where
it is used. Fixes the following warning: ./libmpdemux/asfguid.h:94: warning: 'find_backwards_asf_guid' defined but not used git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27723 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/asfguid.h10
-rw-r--r--libmpdemux/asfheader.c10
2 files changed, 10 insertions, 10 deletions
diff --git a/libmpdemux/asfguid.h b/libmpdemux/asfguid.h
index 6430f738e5..e9b8b08567 100644
--- a/libmpdemux/asfguid.h
+++ b/libmpdemux/asfguid.h
@@ -90,14 +90,4 @@ static int find_asf_guid(char *buf, const char *guid, int cur_pos, int buf_len)
return -1;
}
-static int find_backwards_asf_guid(char *buf, const char *guid, int cur_pos)
-{
- int i;
- for (i=cur_pos-16; i>0; i--) {
- if (memcmp(&buf[i], guid, 16) == 0)
- return i + 16 + 8; // point after guid + length
- }
- return -1;
-}
-
#endif /* MPLAYER_ASFGUID_H */
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index 93bd1354a9..46a7f8831a 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -352,6 +352,16 @@ static int asf_init_audio_stream(demuxer_t *demuxer,struct asf_priv* asf, sh_aud
return 1;
}
+static int find_backwards_asf_guid(char *buf, const char *guid, int cur_pos)
+{
+ int i;
+ for (i=cur_pos-16; i>0; i--) {
+ if (memcmp(&buf[i], guid, 16) == 0)
+ return i + 16 + 8; // point after guid + length
+ }
+ return -1;
+}
+
int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){
int hdr_len = asf->header.objh.size - sizeof(asf->header);
int hdr_skip = 0;