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/ve.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/ve.c')
| -rw-r--r-- | libmpcodecs/ve.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/ve.c b/libmpcodecs/ve.c index 44a90488fa..5d88a0fd77 100644 --- a/libmpcodecs/ve.c +++ b/libmpcodecs/ve.c @@ -23,12 +23,12 @@ extern vf_info_t ve_info_x264; * libraries and encoders requiring binary support. */ static vf_info_t* encoder_list[]={ -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC &ve_info_lavc, #endif -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL &ve_info_vfw, -#ifdef USE_QTX_CODECS_WIN32 +#ifdef CONFIG_QTX_CODECS_WIN32 &ve_info_qtvideo, #endif #endif @@ -39,7 +39,7 @@ static vf_info_t* encoder_list[]={ #ifdef HAVE_XVID4 &ve_info_xvid, #endif -#ifdef USE_LIBLZO +#ifdef CONFIG_LIBLZO &ve_info_nuv, #endif #ifdef HAVE_X264 |