diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:01:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:01:15 +0200 |
commit | 0dce155dd3e52d24c7a0ffbd4be9461170d53de3 (patch) | |
tree | 0d675e2bbd3fa90303f72708b8533d5d068278f4 /stream/asf_streaming.c | |
parent | db7fe7ce92a229c6529b9b6b2894f325a778ead2 (diff) | |
parent | 22e310b9aef77477e022874beb388514911ead1e (diff) | |
download | mpv-0dce155dd3e52d24c7a0ffbd4be9461170d53de3.tar.bz2 mpv-0dce155dd3e52d24c7a0ffbd4be9461170d53de3.tar.xz |
Merge svn changes up to r30694
Diffstat (limited to 'stream/asf_streaming.c')
-rw-r--r-- | stream/asf_streaming.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c index c76ccb5d92..5b92fdcead 100644 --- a/stream/asf_streaming.c +++ b/stream/asf_streaming.c @@ -38,7 +38,7 @@ #include "stream.h" #include "libmpdemux/demuxer.h" - +#include "asf_mmst_streaming.h" #include "network.h" #include "tcp.h" @@ -48,7 +48,6 @@ extern int network_bandwidth; -int asf_mmst_streaming_start( stream_t *stream ); static int asf_http_streaming_start(stream_t *stream, int *demuxer_type); static int asf_read_wrapper(int fd, void *buffer, int len, streaming_ctrl_t *stream_ctrl) { |