summaryrefslogtreecommitdiffstats
path: root/mpcommon.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-08-18 02:29:37 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-08-18 02:29:37 +0300
commit95da34aa071d64b21ef3e952b987ba3dcee84ca0 (patch)
treeeabf4399e40fd270714c53d40688eadadfd4c5ff /mpcommon.c
parentf394231f5de9d1ff679f1b2da4d1f1b303ae914a (diff)
parent3961e12fca2f1ec10c64e3ff298828feecca52c9 (diff)
downloadmpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.bz2
mpv-95da34aa071d64b21ef3e952b987ba3dcee84ca0.tar.xz
Merge svn changes up to r29532
Diffstat (limited to 'mpcommon.c')
-rw-r--r--mpcommon.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/mpcommon.c b/mpcommon.c
index 4a68fe9f25..245383c803 100644
--- a/mpcommon.c
+++ b/mpcommon.c
@@ -13,9 +13,7 @@
#include "spudec.h"
#include "version.h"
#include "vobsub.h"
-#ifdef CONFIG_TV_TELETEXT
#include "stream/tv.h"
-#endif
#include "ffmpeg_files/intreadwrite.h"
#include "m_option.h"