summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-06-09 14:49:37 +0000
committerarpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-06-09 14:49:37 +0000
commit9f4b0cfaef98da90ed05acf311cb2af26d4e1601 (patch)
treea112913640bc2499f99d7265aab84e26974e9157 /loader
parentcc068ac18ff80816b6cb5fa2a65a4ba76cbfbcac (diff)
downloadmpv-9f4b0cfaef98da90ed05acf311cb2af26d4e1601.tar.bz2
mpv-9f4b0cfaef98da90ed05acf311cb2af26d4e1601.tar.xz
ehh. removed duplicated namspace 'std'... and removed include string.h, unneeded for c++
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1074 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader')
-rw-r--r--loader/dshow/DS_AudioDec.c4
-rw-r--r--loader/dshow/DS_VideoDec.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/loader/dshow/DS_AudioDec.c b/loader/dshow/DS_AudioDec.c
index 42e8c3cc7b..b013f5a1d5 100644
--- a/loader/dshow/DS_AudioDec.c
+++ b/loader/dshow/DS_AudioDec.c
@@ -9,13 +9,11 @@
//#include <config.h>
//#include "DS_AudioDecoder.h"
-#include <string.h>
+//#include <string.h>
#include <stdlib.h>
#include <except.h>
#define __MODULE__ "DirectShow_AudioDecoder"
-using namespace std;
-
#include <errno.h>
#ifdef HAVE_MALLOC_H
#include <malloc.h>
diff --git a/loader/dshow/DS_VideoDec.c b/loader/dshow/DS_VideoDec.c
index 6f3cfd6164..645cd1894b 100644
--- a/loader/dshow/DS_VideoDec.c
+++ b/loader/dshow/DS_VideoDec.c
@@ -9,12 +9,11 @@
//#include <config.h>
//#include "DS_VideoDecoder.h"
-#include <string.h>
+//#include <string.h>
#include <stdlib.h>
#include <except.h>
#define __MODULE__ "DirectShow_VideoDecoder"
-using namespace std;
#include <errno.h>
#ifdef HAVE_MALLOC_H