Mercurial > mplayer.hg
diff stream/asf_streaming.c @ 26325:890180cde40f
Make stream independent of libmpdemux, the asf demuxer and streaming
code share a function and a few definitions.
author | albeu |
---|---|
date | Wed, 09 Apr 2008 00:32:35 +0000 |
parents | b61b5a697afc |
children | 5a30f5bc23a0 |
line wrap: on
line diff
--- a/stream/asf_streaming.c Tue Apr 08 22:25:59 2008 +0000 +++ b/stream/asf_streaming.c Wed Apr 09 00:32:35 2008 +0000 @@ -27,12 +27,7 @@ #include "libavutil/intreadwrite.h" -#ifdef ARCH_X86 -#define ASF_LOAD_GUID_PREFIX(guid) (*(uint32_t *)(guid)) -#else -#define ASF_LOAD_GUID_PREFIX(guid) \ - ((guid)[3] << 24 | (guid)[2] << 16 | (guid)[1] << 8 | (guid)[0]) -#endif +#include "libmpdemux/asfguid.h" extern int network_bandwidth; @@ -151,10 +146,6 @@ return stream_chunck->size+4; } -extern int find_asf_guid(char *buf, const char *guid, int cur_pos, int buf_len); -extern const char asf_file_header_guid[]; -extern const char asf_stream_header_guid[]; -extern const char asf_stream_group_guid[]; extern int audio_id; extern int video_id;