summaryrefslogtreecommitdiffstats
path: root/stream/stream_dvd_common.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-17 02:18:10 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-06-17 05:04:32 +0300
commit68e70b3ec34af2e1002d17d0dc81b3408a399ade (patch)
treeb6b00fd57b24e713e0dc180b64d266b958df7daa /stream/stream_dvd_common.h
parentaf3fcdf2ded43e887bceed3a957b5cc4f7dbc2c6 (diff)
parentdcd0902bcdb1a62f4246cbfba48bd1b77841ceda (diff)
downloadmpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.bz2
mpv-68e70b3ec34af2e1002d17d0dc81b3408a399ade.tar.xz
Merge svn changes up to r27092
Conflicts: libmpdemux/demuxer.c libvo/vo_xv.c mencoder.c
Diffstat (limited to 'stream/stream_dvd_common.h')
-rw-r--r--stream/stream_dvd_common.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h
index 443daa45f9..b1d31d1dde 100644
--- a/stream/stream_dvd_common.h
+++ b/stream/stream_dvd_common.h
@@ -1,6 +1,7 @@
#ifndef MPLAYER_STREAM_DVD_COMMON_H
#define MPLAYER_STREAM_DVD_COMMON_H
+#include "config.h"
#include <inttypes.h>
#ifdef USE_DVDREAD_INTERNAL
#include <dvdread/ifo_types.h>