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/stream.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/stream.c')
| -rw-r--r-- | stream/stream.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/stream.c b/stream/stream.c index 99225ca3b4..772c87dd9c 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -30,6 +30,9 @@ #include <strings.h> #include <assert.h> +#include <libavutil/intreadwrite.h> +#include <libavutil/common.h> + #include "talloc.h" #include "config.h" @@ -38,15 +41,12 @@ #include <winsock2.h> #endif -#include <libavutil/common.h> - #include "mp_msg.h" #include "osdep/shmem.h" #include "osdep/timer.h" #include "network.h" #include "stream.h" #include "libmpdemux/demuxer.h" -#include "ffmpeg_files/intreadwrite.h" #include "m_option.h" #include "m_struct.h" |