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 /mpcommon.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 'mpcommon.c')
| -rw-r--r-- | mpcommon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mpcommon.c b/mpcommon.c index f0a2d0e1a3..c577dce4fd 100644 --- a/mpcommon.c +++ b/mpcommon.c @@ -16,7 +16,7 @@ double sub_last_pts = -303; -#ifdef USE_ASS +#ifdef CONFIG_ASS #include "libass/ass.h" #include "libass/ass_mp.h" ass_track_t* ass_track = 0; // current track to render @@ -118,7 +118,7 @@ void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset) len = FFMIN(len - 2, AV_RB16(packet)); packet += 2; } -#ifdef USE_ASS +#ifdef CONFIG_ASS if (ass_enabled) { sh_sub_t* sh = d_dvdsub->sh; ass_track = sh ? sh->ass_track : NULL; |