diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-07-30 16:39:24 +0300 |
commit | 04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (patch) | |
tree | b09b4c45898be2754f156ebba16fa1054f42788d /libvo/sub.h | |
parent | 3a69d65f8d07c54f4c9eb2d9c89ab50e35d0a50d (diff) | |
parent | 1fdf02e6fbd896c8fcce03992ecdf36144d85714 (diff) | |
download | mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.bz2 mpv-04f3909a724a06ca5a5a3921061f2ba9fb9d8787.tar.xz |
Merge svn changes up to r27374
Conflicts:
cfg-common-opts.h
cfg-mplayer.h
command.c
configure
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libmpcodecs/vf_vo.c
libmpdemux/demuxer.h
libmpdemux/stheader.h
mp_core.h
mplayer.c
stream/stream_radio.c
Diffstat (limited to 'libvo/sub.h')
-rw-r--r-- | libvo/sub.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libvo/sub.h b/libvo/sub.h index c793a6b6aa..a1e7acd3c4 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -128,7 +128,7 @@ extern int vo_osd_changed_flag; unsigned utf8_get_char(const char **str); -#ifdef USE_DVDNAV +#ifdef CONFIG_DVDNAV #include <inttypes.h> void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey); #endif |