diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:17:56 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 01:17:56 +0200 |
| commit | d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec (patch) | |
| tree | bfcdec92ef691c472bb71a896ccb5ee1d7e29129 | |
| parent | dd0bab9239fb1be1df856205d6a5c085910e0ae8 (diff) | |
| parent | 1d3fd9e1ea720c23076268cb69fa2c4245dd9109 (diff) | |
| download | mpv-d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec.tar.bz2 mpv-d157b2a8ce6c4a708b91dc5e2d52b2d672e8c2ec.tar.xz | |
Merge svn changes up to r30173
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | etc/codecs.conf | 2 | ||||
| -rw-r--r-- | libaf/af_format.h | 2 | ||||
| -rw-r--r-- | loader/wine/basetsd.h | 4 | ||||
| -rw-r--r-- | loader/wine/winnt.h | 7 | ||||
| -rw-r--r-- | stream/tvi_dshow.c | 5 | ||||
| -rw-r--r-- | stream/tvi_dshow.h | 16 |
7 files changed, 30 insertions, 7 deletions
@@ -4432,6 +4432,7 @@ if test "$_vidix" = auto ; then _vidix=no x86 && (linux || freebsd || netbsd || openbsd || dragonfly || sunos || win32) \ && _vidix=yes + x86_64 && win32 && _vidix=no (ppc || alpha) && linux && _vidix=yes fi echores "$_vidix" diff --git a/etc/codecs.conf b/etc/codecs.conf index be548cac61..0c082420c3 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -362,7 +362,7 @@ videocodec ffdpx fourcc "dpx " ; "dpx " is an internal MPlayer FOURCC driver ffmpeg dll dpx - out RGB48BE,RGB48LE + out RGB48BE,RGB48LE,RGB24,RGB32,BGR32 videocodec ffgif info "FFmpeg GIF" diff --git a/libaf/af_format.h b/libaf/af_format.h index 66a74c901e..e5e5c1cb05 100644 --- a/libaf/af_format.h +++ b/libaf/af_format.h @@ -59,7 +59,7 @@ #define AF_FORMAT_MU_LAW (1<<6) #define AF_FORMAT_A_LAW (2<<6) #define AF_FORMAT_MPEG2 (3<<6) // MPEG(2) audio -#define AF_FORMAT_AC3 (4<<6) // Dolby Digital AC3 +#define AF_FORMAT_AC3 ((4<<6)|AF_FORMAT_16BIT) // Dolby Digital AC3 #define AF_FORMAT_IMA_ADPCM (5<<6) #define AF_FORMAT_SPECIAL_MASK (7<<6) diff --git a/loader/wine/basetsd.h b/loader/wine/basetsd.h index 0cc60c11e3..7a13d58dba 100644 --- a/loader/wine/basetsd.h +++ b/loader/wine/basetsd.h @@ -72,8 +72,8 @@ typedef unsigned __int64 __uint64; #if defined(_WIN64) -typedef __uint32 __ptr32; -typedef void *__ptr64; +//typedef __uint32 __ptr32; +//typedef void *__ptr64; #else /* FIXME: defined(_WIN32) */ diff --git a/loader/wine/winnt.h b/loader/wine/winnt.h index b4c8ee1573..b79b528752 100644 --- a/loader/wine/winnt.h +++ b/loader/wine/winnt.h @@ -620,7 +620,8 @@ typedef struct CONTEXT #endif /* __sparc__ */ #if !defined(CONTEXT_FULL) && !defined(RC_INVOKED) -#error You need to define a CONTEXT for your CPU +#warning You need to define a CONTEXT for your CPU +typedef void CONTEXT; #endif typedef CONTEXT *PCONTEXT; @@ -747,7 +748,7 @@ typedef HANDLE *PHANDLE; #endif /* __sparc__ */ #ifndef DEFINE_REGS_ENTRYPOINT_0 -#error You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU +#warning You need to define DEFINE_REGS_ENTRYPOINT macros for your CPU #endif #ifdef __i386__ @@ -758,7 +759,7 @@ typedef HANDLE *PHANDLE; #endif #if !defined(GET_IP) && !defined(RC_INVOKED) -# error You must define GET_IP for this CPU +#warning You must define GET_IP for this CPU #endif /* diff --git a/stream/tvi_dshow.c b/stream/tvi_dshow.c index 09c6328d8d..50830da848 100644 --- a/stream/tvi_dshow.c +++ b/stream/tvi_dshow.c @@ -89,6 +89,11 @@ #include "tvi_dshow.h" +#ifndef STDCALL +// mingw64 needs this +#define STDCALL __stdcall +#endif + static tvi_handle_t *tvi_init_dshow(tv_param_t* tv_param); /* diff --git a/stream/tvi_dshow.h b/stream/tvi_dshow.h index dc5a7c3741..3dea9d348a 100644 --- a/stream/tvi_dshow.h +++ b/stream/tvi_dshow.h @@ -434,6 +434,8 @@ DECLARE_INTERFACE(IAMCrossbar) STDMETHOD(get_CrossbarPinInfo) (THIS_ BOOL, long, long *, long *); }; +#ifndef __IPropertyBag_INTERFACE_DEFINED__ +#define __IPropertyBag_INTERFACE_DEFINED__ #undef INTERFACE #define INTERFACE IPropertyBag DECLARE_INTERFACE(IPropertyBag) @@ -444,6 +446,7 @@ DECLARE_INTERFACE(IPropertyBag) STDMETHOD(Read) (THIS_ LPCOLESTR, LPVARIANT, LPERRORLOG); STDMETHOD(Write) (THIS_ LPCOLESTR, LPVARIANT); }; +#endif #undef INTERFACE #define INTERFACE IAMStreamConfig @@ -678,6 +681,19 @@ DECLARE_INTERFACE(IVideoWindow) STDMETHOD(IsCursorHidden) (THIS_ long *); }; +#ifndef DECLARE_ENUMERATOR_ +#define DECLARE_ENUMERATOR_(I,T) \ + DECLARE_INTERFACE_(I,IUnknown) \ + { \ + STDMETHOD(QueryInterface)(I*, REFIID,PVOID*); \ + STDMETHOD_(ULONG,AddRef)(I*); \ + STDMETHOD_(ULONG,Release)(I*); \ + STDMETHOD(Next)(I*, ULONG,T*,ULONG*); \ + STDMETHOD(Skip)(I*, ULONG); \ + STDMETHOD(Reset)(I*); \ + STDMETHOD(Clone)(I*, I**); \ + } +#endif DECLARE_ENUMERATOR_(IEnumFilters, LPBASEFILTER); DECLARE_ENUMERATOR_(IEnumPins, LPPIN); DECLARE_ENUMERATOR_(IEnumMediaTypes, AM_MEDIA_TYPE *); |