diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:04:43 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-08-08 02:13:09 +0300 |
| commit | 17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069 (patch) | |
| tree | 5d1910a2ab6381f6b4fb0ffc2834f55f7fef7129 /mpcommon.c | |
| parent | 2ba9df3df3d61a7cc1bde9f897bc77eaaf14b383 (diff) | |
| parent | af76be6e197382af491fadef3fcf821a721c99f5 (diff) | |
| download | mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.bz2 mpv-17d3e4b36d18f4a653f7c5f6ea2f15fcd3a2f069.tar.xz | |
Merge svn changes up to r27441
Conflicts:
cfg-common-opts.h
command.c
configure
input/input.c
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpdemux/stheader.h
libvo/sub.c
libvo/video_out.c
libvo/vo_xv.c
libvo/vosub_vidix.c
libvo/x11_common.c
libvo/x11_common.h
mp_core.h
mplayer.c
stream/stream.h
Diffstat (limited to 'mpcommon.c')
| -rw-r--r-- | mpcommon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mpcommon.c b/mpcommon.c index 980da30d4e..c6a8559013 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -8,7 +8,7 @@ #include "libvo/video_out.h" #include "spudec.h" #include "vobsub.h" -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT #include "stream/tv.h" #endif #include "libavutil/intreadwrite.h" @@ -167,7 +167,7 @@ void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset) void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset) { -#ifdef HAVE_TV_TELETEXT +#ifdef CONFIG_TV_TELETEXT tvi_handle_t* tvh=demuxer->priv; int page_changed; |