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 /vobsub.c | |
| 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 'vobsub.c')
| -rw-r--r-- | vobsub.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -20,7 +20,7 @@ #include "vobsub.h" #include "spudec.h" #include "mp_msg.h" -#ifdef USE_UNRAR_EXEC +#ifdef CONFIG_UNRAR_EXEC #include "unrar_exec.h" #endif #include "libavutil/common.h" @@ -34,7 +34,7 @@ static int vobsubid = -2; * RAR stream handling * The RAR file must have the same basename as the file to open **********************************************************************/ -#ifdef USE_UNRAR_EXEC +#ifdef CONFIG_UNRAR_EXEC typedef struct { FILE *file; unsigned char *data; |