summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 22:47:41 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 22:47:41 +0200
commit8e593f5a34b4827d6ec97dd875c802267a6f03b7 (patch)
tree648fde930e4a2b836a9803b17944c370a9608c72 /loader
parentbf31241e932818df3bc2eba55cf06c2b9ee3f56f (diff)
parent5c10618fa191d306e6d6674dd2fc7ad46476f85d (diff)
downloadmpv-8e593f5a34b4827d6ec97dd875c802267a6f03b7.tar.bz2
mpv-8e593f5a34b4827d6ec97dd875c802267a6f03b7.tar.xz
Merge svn changes up to r30529
Diffstat (limited to 'loader')
-rw-r--r--loader/dshow/DS_Filter.c1
-rw-r--r--loader/ldt_keeper.c16
-rw-r--r--loader/win32.h9
3 files changed, 5 insertions, 21 deletions
diff --git a/loader/dshow/DS_Filter.c b/loader/dshow/DS_Filter.c
index 42b47b8626..e3102cf264 100644
--- a/loader/dshow/DS_Filter.c
+++ b/loader/dshow/DS_Filter.c
@@ -209,6 +209,7 @@ DS_Filter* DS_FilterCreate(const char* dllname, const GUID* id,
enum_pins->vt->Reset(enum_pins);
result = enum_pins->vt->Next(enum_pins, (ULONG)256, (IPin**)array, &fetched);
+ enum_pins->vt->Release(enum_pins);
Debug printf("Pins enumeration returned %ld pins, error is %x\n", fetched, (int)result);
for (i = 0; i < fetched; i++)
diff --git a/loader/ldt_keeper.c b/loader/ldt_keeper.c
index adbe9900c9..35025888ca 100644
--- a/loader/ldt_keeper.c
+++ b/loader/ldt_keeper.c
@@ -60,14 +60,10 @@ int modify_ldt(int func, void *ptr, unsigned long bytecount);
#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
#include <machine/segments.h>
#include <machine/sysarch.h>
-#endif
-
-#if defined(__APPLE__)
+#elif defined(__APPLE__)
#include <architecture/i386/table.h>
#include <i386/user_ldt.h>
-#endif
-
-#ifdef __svr4__
+#elif defined(__svr4__)
#include <sys/segment.h>
#include <sys/sysi86.h>
@@ -238,9 +234,7 @@ ldt_fs_t* Setup_LDT_Keeper(void)
perror("install_fs");
printf("Couldn't install fs segment, expect segfault\n");
}
-#endif /*linux*/
-
-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
+#elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__)
{
unsigned long d[2];
@@ -262,9 +256,7 @@ ldt_fs_t* Setup_LDT_Keeper(void)
#endif
}
}
-#endif /* __NetBSD__ || __FreeBSD__ || __OpenBSD__ || __DragonFly__ || __APPLE__ */
-
-#if defined(__svr4__)
+#elif defined(__svr4__)
{
struct ssd ssd;
ssd.sel = LDT_SEL(TEB_SEL_IDX);
diff --git a/loader/win32.h b/loader/win32.h
index 1e90827da0..bc2a28aeb8 100644
--- a/loader/win32.h
+++ b/loader/win32.h
@@ -12,15 +12,6 @@
#include "wine/winbase.h"
#include "com.h"
-#ifdef AVIFILE
-#ifdef __GNUC__
-#include "avm_output.h"
-#ifndef __cplusplus
-#define printf(a, ...) avm_printf("Win32 plugin", a, ## __VA_ARGS__)
-#endif
-#endif
-#endif
-
void my_garbagecollection(void);
typedef struct {