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/vd.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/vd.c')
| -rw-r--r-- | libmpcodecs/vd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 4e7c2d20b1..835f809f98 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -49,13 +49,13 @@ extern const vd_functions_t mpcodecs_vd_qtvideo; const vd_functions_t * const mpcodecs_vd_drivers[] = { &mpcodecs_vd_null, -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC &mpcodecs_vd_ffmpeg, #endif #ifdef HAVE_OGGTHEORA &mpcodecs_vd_theora, #endif -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL &mpcodecs_vd_dshow, &mpcodecs_vd_dmo, &mpcodecs_vd_vfw, @@ -65,7 +65,7 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = { &mpcodecs_vd_raw, &mpcodecs_vd_hmblck, &mpcodecs_vd_nuv, -#ifdef USE_XANIM +#ifdef CONFIG_XANIM &mpcodecs_vd_xanim, #endif #ifdef HAVE_PNG @@ -76,14 +76,14 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = { #endif &mpcodecs_vd_mtga, &mpcodecs_vd_sgi, -#ifdef USE_LIBMPEG2 +#ifdef CONFIG_LIBMPEG2 &mpcodecs_vd_libmpeg2, #endif &mpcodecs_vd_mpegpes, #ifdef HAVE_ZR &mpcodecs_vd_zrmjpeg, #endif -#ifdef USE_REALCODECS +#ifdef CONFIG_REALCODECS &mpcodecs_vd_realvid, #endif #ifdef HAVE_XVID4 @@ -92,7 +92,7 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = { #ifdef HAVE_LIBDV095 &mpcodecs_vd_libdv, #endif -#ifdef USE_QTX_CODECS +#ifdef CONFIG_QTX_CODECS &mpcodecs_vd_qtvideo, #endif /* Please do not add any new decoders here. If you want to implement a new |