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/vcd_read_fbsd.h | |
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/vcd_read_fbsd.h')
-rw-r--r-- | stream/vcd_read_fbsd.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h index 8a59a2a8ee..406cb902da 100644 --- a/stream/vcd_read_fbsd.h +++ b/stream/vcd_read_fbsd.h @@ -24,9 +24,11 @@ #include <sys/types.h> #include <inttypes.h> #include <unistd.h> -#include "ffmpeg_files/intreadwrite.h" #include <sys/cdio.h> #include <sys/ioctl.h> + +#include <libavutil/intreadwrite.h> + #if defined(__NetBSD__) || defined(__OpenBSD__) #define VCD_NETBSD 1 #endif |