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 /libvo/vo_sdl.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 'libvo/vo_sdl.c')
| -rw-r--r-- | libvo/vo_sdl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index ae16d0e599..71cf75323a 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -66,7 +66,7 @@ #include "sub/sub.h" #include "aspect.h" #include "libmpcodecs/vfcap.h" -#include "ffmpeg_files/bswap.h" +#include "mpbswap.h" #ifdef CONFIG_X11 #include <X11/Xlib.h> |