diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:47:25 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:47:25 +0200 |
commit | 90f5873f1a4b528dc245beb75b834c52ef04b3db (patch) | |
tree | 9ede9db5ad14d812f1211510b9e48ea11c915458 /loader | |
parent | 15a604c405cb53054853cdc426e124936d6321d8 (diff) | |
parent | 8ba6b4eaf939f34ac34993aa225143b4102f6c02 (diff) | |
download | mpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.bz2 mpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.xz |
Merge svn changes up to r30675
Diffstat (limited to 'loader')
-rw-r--r-- | loader/dmo/dmo_guids.c | 1 | ||||
-rw-r--r-- | loader/wine/pshpack1.h | 1 | ||||
-rw-r--r-- | loader/wine/pshpack4.h | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/loader/dmo/dmo_guids.c b/loader/dmo/dmo_guids.c index 8dbeb40459..484d4564e2 100644 --- a/loader/dmo/dmo_guids.c +++ b/loader/dmo/dmo_guids.c @@ -39,4 +39,3 @@ const GUID DMOCATEGORY_AUDIO_NOISE_SUPPRESS = { 0xe07f903f, 0x62fd, 0x4e60, const GUID DMOCATEGORY_AGC = { 0xe88c9ba0l, 0xc557, 0x11d0, { 0x8a, 0x2b, 0x00, 0xa0, 0xc9, 0x25, 0x5a, 0xc1}}; - diff --git a/loader/wine/pshpack1.h b/loader/wine/pshpack1.h index 66f9864e37..5ab9b95061 100644 --- a/loader/wine/pshpack1.h +++ b/loader/wine/pshpack1.h @@ -10,4 +10,3 @@ #else /* MPLAYER_PSHPACK_H */ #error "Nested pushing of alignment isn't supported by the compiler" #endif /* MPLAYER_PSHPACK_H */ - diff --git a/loader/wine/pshpack4.h b/loader/wine/pshpack4.h index 7adc453cf4..1b37492232 100644 --- a/loader/wine/pshpack4.h +++ b/loader/wine/pshpack4.h @@ -12,4 +12,3 @@ #else /* MPLAYER_PSHPACK_H */ #error "Nested pushing of alignment isn't supported by the compiler" #endif /* MPLAYER_PSHPACK_H */ - |