diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-09 00:32:35 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-09 00:32:35 +0000 |
| commit | 64868a36cd8113336745f5baf336ae76553de9ab (patch) | |
| tree | e00c8b7f1bde6d9f272070a2a8cc280e06b1a227 /stream | |
| parent | 32824f5ecaeea23c17d032014bcccdf5210eafc3 (diff) | |
| download | mpv-64868a36cd8113336745f5baf336ae76553de9ab.tar.bz2 mpv-64868a36cd8113336745f5baf336ae76553de9ab.tar.xz | |
Make stream independent of libmpdemux, the asf demuxer and streaming
code share a function and a few definitions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26357 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/asf_streaming.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c index 6db07344af..448f41064d 100644 --- a/stream/asf_streaming.c +++ b/stream/asf_streaming.c @@ -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 @@ printf("0x%02X\n", stream_chunck->type ); 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; |