[MPlayer-cvslog] r27723 - in trunk/libmpdemux: asfguid.h asfheader.c
diego
subversion at mplayerhq.hu
Sun Oct 5 23:44:42 CEST 2008
Author: diego
Date: Sun Oct 5 23:44:42 2008
New Revision: 27723
Log:
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
Modified:
trunk/libmpdemux/asfguid.h
trunk/libmpdemux/asfheader.c
Modified: trunk/libmpdemux/asfguid.h
==============================================================================
--- trunk/libmpdemux/asfguid.h (original)
+++ trunk/libmpdemux/asfguid.h Sun Oct 5 23:44:42 2008
@@ -90,14 +90,4 @@ static int find_asf_guid(char *buf, cons
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 */
Modified: trunk/libmpdemux/asfheader.c
==============================================================================
--- trunk/libmpdemux/asfheader.c (original)
+++ trunk/libmpdemux/asfheader.c Sun Oct 5 23:44:42 2008
@@ -352,6 +352,16 @@ static int asf_init_audio_stream(demuxer
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;
More information about the MPlayer-cvslog
mailing list