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.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.c')
| -rw-r--r-- | libmpcodecs/vf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index cdc6ff6352..af80a47a66 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -108,7 +108,7 @@ static const vf_info_t* const filter_list[]={ #endif &vf_info_crop, &vf_info_expand, -#ifdef USE_LIBPOSTPROC +#ifdef CONFIG_LIBPOSTPROC &vf_info_pp, #endif &vf_info_scale, @@ -123,7 +123,7 @@ static const vf_info_t* const filter_list[]={ &vf_info_mirror, &vf_info_palette, &vf_info_pp7, -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC &vf_info_lavc, &vf_info_lavcdeint, &vf_info_screenshot, @@ -170,7 +170,7 @@ static const vf_info_t* const filter_list[]={ &vf_info_delogo, &vf_info_remove_logo, &vf_info_hue, -#ifdef USE_LIBAVCODEC_A +#ifdef CONFIG_LIBAVCODEC_A &vf_info_spp, &vf_info_uspp, &vf_info_fspp, @@ -185,7 +185,7 @@ static const vf_info_t* const filter_list[]={ &vf_info_divtc, &vf_info_harddup, &vf_info_softskip, -#ifdef USE_ASS +#ifdef CONFIG_ASS &vf_info_ass, #endif &vf_info_yadif, |