RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-06 07:01:45 +00:00
Code Issues Releases Wiki Activity

Merge svn changes up to r30173

Browse Source
This commit is contained in:
Uoti Urpala 2010-01-08 01:17:56 +02:00
commit d157b2a8ce
7 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -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"

2
etc/codecs.conf
View File

@ -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"

2
libaf/af_format.h
View File

@ -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)

4
loader/wine/basetsd.h
View File

@ -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) */

7
loader/wine/winnt.h
View File

@ -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
/*

5
stream/tvi_dshow.c
View File

@ -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);
/*

16
stream/tvi_dshow.h
View File

@ -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 *);