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/pnm.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/pnm.c')
| -rw-r--r-- | stream/pnm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stream/pnm.c b/stream/pnm.c index 46c22361d9..b1baad70a3 100644 --- a/stream/pnm.c +++ b/stream/pnm.c @@ -23,8 +23,6 @@ * based upon code from joschka */ -#include "config.h" - #include <unistd.h> #include <stdio.h> #include <assert.h> @@ -35,6 +33,10 @@ #include <stdlib.h> #include <sys/time.h> #include <inttypes.h> + +#include <libavutil/intreadwrite.h> + +#include "config.h" #if !HAVE_WINSOCK2_H #include <sys/socket.h> //#include <netinet/in.h> @@ -43,8 +45,6 @@ #include <winsock2.h> #endif -#include "ffmpeg_files/intreadwrite.h" - #include "stream.h" #include "libmpdemux/demuxer.h" #include "osdep/timer.h" |