diff options
| author | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-03-05 22:24:57 +0100 |
| commit | 8dc0743571630a08fd40fa88aa09b12b4ce65bf2 (patch) | |
| tree | e1c4465768635d77954b5fd21ae726444ee4f48a /stream/asf_streaming.c | |
| parent | aebdf4f153438497b9310bd1417b5216f07e043b (diff) | |
| parent | afecdb681bed81b5df0ed18a300c68be603dfdf9 (diff) | |
| download | mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.bz2 mpv-8dc0743571630a08fd40fa88aa09b12b4ce65bf2.tar.xz | |
Merge remote-tracking branch 'origin/master' into my_master
Conflicts:
mplayer.c
screenshot.c
Diffstat (limited to 'stream/asf_streaming.c')
| -rw-r--r-- | stream/asf_streaming.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/asf_streaming.c b/stream/asf_streaming.c index 73197f4f54..8c747abfdf 100644 --- a/stream/asf_streaming.c +++ b/stream/asf_streaming.c @@ -23,6 +23,8 @@ #include <errno.h> #include <limits.h> +#include <libavutil/intreadwrite.h> + #include "config.h" #include "mp_msg.h" #include "options.h" @@ -41,8 +43,6 @@ #include "network.h" #include "tcp.h" -#include "ffmpeg_files/intreadwrite.h" - #include "libmpdemux/asfguid.h" extern int network_bandwidth; |