summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-02 17:11:49 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-01-02 17:11:49 +0000
commitbefc74468f326f23aa9ce5068d8ff0c9a561a5b1 (patch)
treeccb0ad606601a2064acdd076dc17f5fdd912ea44
parentd25cad40a8e68af9c268be4b7bb3010e4e87b8c2 (diff)
downloadmpv-befc74468f326f23aa9ce5068d8ff0c9a561a5b1.tar.bz2
mpv-befc74468f326f23aa9ce5068d8ff0c9a561a5b1.tar.xz
using dshow headers from dshow/ instead of c++ version
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3948 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--dec_audio.c4
-rw-r--r--dec_video.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/dec_audio.c b/dec_audio.c
index c16b07c252..68d3328fac 100644
--- a/dec_audio.c
+++ b/dec_audio.c
@@ -62,8 +62,8 @@ int fakemono=0;
#endif
#ifdef USE_DIRECTSHOW
-#include "loader/DirectShow/DS_AudioDec.h"
-static void* ds_adec=NULL;
+#include "loader/dshow/DS_AudioDecoder.h"
+static DS_AudioDecoder* ds_adec=NULL;
#endif
#ifdef HAVE_OGGVORBIS
diff --git a/dec_video.c b/dec_video.c
index ac2957787c..c5c910d6fc 100644
--- a/dec_video.c
+++ b/dec_video.c
@@ -55,8 +55,8 @@ extern picture_t *picture; // exported from libmpeg2/decode.c
int divx_quality=0;
#ifdef USE_DIRECTSHOW
-#include "loader/DirectShow/DS_VideoDec.h"
-static void* ds_vdec=NULL;
+#include "loader/dshow/DS_VideoDecoder.h"
+static DS_VideoDecoder* ds_vdec=NULL;
#endif
#ifdef USE_LIBAVCODEC