summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-02 22:04:35 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-08-02 22:04:35 +0300
commit6cce822505c0a76ac520909a895021b8f5b7e5ab (patch)
treef8ba954c698470208a243be3da216f7f54367f46 /libmpcodecs/vd.c
parent04f3909a724a06ca5a5a3921061f2ba9fb9d8787 (diff)
parentded7033671fb7d84fbdb67ace46c1fc8833631bc (diff)
downloadmpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.bz2
mpv-6cce822505c0a76ac520909a895021b8f5b7e5ab.tar.xz
Merge svn changes up to r27399
Conflicts: libmpcodecs/vd.c libmpcodecs/ve_raw.c libvo/video_out.c libvo/x11_common.c mplayer.c
Diffstat (limited to 'libmpcodecs/vd.c')
-rw-r--r--libmpcodecs/vd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 835f809f98..e8c02798ab 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -52,7 +52,7 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = {
#ifdef CONFIG_LIBAVCODEC
&mpcodecs_vd_ffmpeg,
#endif
-#ifdef HAVE_OGGTHEORA
+#ifdef CONFIG_OGGTHEORA
&mpcodecs_vd_theora,
#endif
#ifdef CONFIG_WIN32DLL
@@ -86,10 +86,10 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = {
#ifdef CONFIG_REALCODECS
&mpcodecs_vd_realvid,
#endif
-#ifdef HAVE_XVID4
+#ifdef CONFIG_XVID4
&mpcodecs_vd_xvid,
#endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
&mpcodecs_vd_libdv,
#endif
#ifdef CONFIG_QTX_CODECS