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 /libmpcodecs/vf_vo.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 'libmpcodecs/vf_vo.c')
| -rw-r--r-- | libmpcodecs/vf_vo.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index ac249345ed..4f47bc1847 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -10,7 +10,7 @@ #include "libvo/video_out.h" -#ifdef USE_ASS +#ifdef CONFIG_ASS #include "libass/ass.h" #include "libass/ass_mp.h" extern ass_track_t* ass_track; @@ -24,7 +24,7 @@ extern float sub_delay; struct vf_priv_s { double pts; struct vo *vo; -#ifdef USE_ASS +#ifdef CONFIG_ASS ass_renderer_t* ass_priv; int prev_visibility; #endif @@ -63,7 +63,7 @@ static int config(struct vf_instance* vf, if (vo_config(video_out, width, height, d_width, d_height, flags, "MPlayer", outfmt)) return 0; -#ifdef USE_ASS +#ifdef CONFIG_ASS if (vf->priv->ass_priv) ass_configure(vf->priv->ass_priv, width, height, !!(vf->default_caps & VFCAP_EOSD_UNSCALED)); #endif @@ -108,7 +108,7 @@ static int control(struct vf_instance* vf, int request, void* data) struct voctrl_get_equalizer_args param = {eq->item, &eq->value}; return vo_control(video_out, VOCTRL_GET_EQUALIZER, ¶m) == VO_TRUE; } -#ifdef USE_ASS +#ifdef CONFIG_ASS case VFCTRL_INIT_EOSD: { vf->priv->ass_priv = ass_renderer_init((ass_library_t*)data); @@ -199,7 +199,7 @@ static void draw_slice(struct vf_instance* vf, static void uninit(struct vf_instance* vf) { if (vf->priv) { -#ifdef USE_ASS +#ifdef CONFIG_ASS if (vf->priv->ass_priv) ass_renderer_done(vf->priv->ass_priv); #endif |