summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-28 21:56:09 +0200
committerwm4 <wm4@nowhere>2015-05-28 21:56:09 +0200
commit0699a6c598bc1c8968f426be37b62052f7cb1eb9 (patch)
treea3f7c74e35f242d39247afb6882b88f048bee8c2
parenta9b1e72ef2f6da931bdbd2e8e50424183869698c (diff)
downloadmpv-0699a6c598bc1c8968f426be37b62052f7cb1eb9.tar.bz2
mpv-0699a6c598bc1c8968f426be37b62052f7cb1eb9.tar.xz
video: rename vdpau.c to vdpau_old.c
vdpau.c will be used for new code.
-rw-r--r--TOOLS/old-makefile2
-rw-r--r--video/decode/vdpau_old.c (renamed from video/decode/vdpau.c)0
-rw-r--r--wscript_build.py2
3 files changed, 2 insertions, 2 deletions
diff --git a/TOOLS/old-makefile b/TOOLS/old-makefile
index 32b547894a..8ab080ac4a 100644
--- a/TOOLS/old-makefile
+++ b/TOOLS/old-makefile
@@ -79,7 +79,7 @@ SOURCES-$(PULSE) += audio/out/ao_pulse.c
SOURCES-$(RSOUND) += audio/out/ao_rsound.c
SOURCES-$(SNDIO) += audio/out/ao_sndio.c
SOURCES-$(VDPAU) += video/vdpau.c video/vdpau_mixer.c \
- video/out/vo_vdpau.c video/decode/vdpau.c \
+ video/out/vo_vdpau.c video/decode/vdpau_old.c \
video/filter/vf_vdpaupp.c
SOURCES-$(VDPAU_GL_X11) += video/out/gl_hwdec_vdpau.c
SOURCES-$(VAAPI) += video/out/vo_vaapi.c \
diff --git a/video/decode/vdpau.c b/video/decode/vdpau_old.c
index 83dfa0bc56..83dfa0bc56 100644
--- a/video/decode/vdpau.c
+++ b/video/decode/vdpau_old.c
diff --git a/wscript_build.py b/wscript_build.py
index 0dcb006a4d..aa33272718 100644
--- a/wscript_build.py
+++ b/wscript_build.py
@@ -296,7 +296,7 @@ def build(ctx):
( "video/decode/vaapi.c", "vaapi-hwaccel" ),
( "video/decode/vd_lavc.c" ),
( "video/decode/vda.c", "vda-hwaccel" ),
- ( "video/decode/vdpau.c", "vdpau-hwaccel" ),
+ ( "video/decode/vdpau_old.c", "vdpau-hwaccel" ),
( "video/filter/vf.c" ),
( "video/filter/vf_buffer.c" ),
( "video/filter/vf_crop.c" ),