AM_CONFIG_HEADER(config.h)
STREAMER_MAJOR_VERSION=0
-STREAMER_MINOR_VERSION=0
-STREAMER_MICRO_VERSION=9.2
+STREAMER_MINOR_VERSION=9
+STREAMER_MICRO_VERSION=2
STREAMER_VERSION=$STREAMER_MAJOR_VERSION.$STREAMER_MINOR_VERSION.$STREAMER_MICRO_VERSION
dnl libtool
glib gmodule gthread)
dnl Put the glib flags into $LIBS and $CFLAGS since we always use them
LIBS="$LIBS $GLIB_LIBS"
-CFLAGS="$CFLAGS $GLIB_CFLAGS"
+CFLAGS="$FLAGS $GLIB_CFLAGS"
dnl Check for libxml
AC_PATH_PROG(XML_CONFIG, xml-config, no)
AM_CONDITIONAL(HAVE_ATOMIC_H, test "x$USE_ATOMIC_H" = "xyes")
AM_CONDITIONAL(HAVE_XAUDIO, test "x$HAVE_XAUDIO" = "xyes")
AM_CONDITIONAL(HAVE_CSSAUTH, test "x$HAVE_CSSAUTH" = "xyes")
-AM_CONDITIONAL(HAVE_GTK_DOC, test "x$HAVE_GTK_DOC" = "xyes")
+AM_CONDITIONAL(HAVE_GTK_DOC, $HAVE_GTK_DOC)
dnl FIXME: having to AC_SUBST these is messy. Not sure if CPPFLAGS and LDFLAGS
plugins/au/Makefile
plugins/wav/Makefile
plugins/avi/Makefile
+plugins/avi/wincodec/Makefile
plugins/jpeg/Makefile
plugins/mp3decode/Makefile
plugins/mp3decode/xa/Makefile
plugins/mpeg2/ac3dec/Makefile
plugins/mpeg2/video/Makefile
plugins/mpeg2/mpeg2enc/Makefile
+plugins/mpeg2/subtitles/Makefile
plugins/mpeg1/Makefile
plugins/mpeg1/mpeg_play/Makefile
plugins/mpeg1/mpegaudio/Makefile
* AVIFMT - AVI file format definitions\r
*\r
****************************************************************************/\r
-\r
-#ifndef NOAVIFMT\r
+#ifndef AVIFMT\r
+#define AVIFMT
+
+#ifndef NOAVIFMT\r
#ifndef __WINE_WINDEF_H
#include <wine/windef.h>
\r
#define AVIIF_NOTIME 0x00000100L // this frame doesn't take any time\r
#define AVIIF_COMPUSE 0x0FFF0000L // these bits are for compressor use\r
+
+#define FOURCC_RIFF mmioFOURCC('R', 'I', 'F', 'F')\r
+#define FOURCC_LIST mmioFOURCC('L', 'I', 'S', 'T')\r
\r
typedef struct\r
{\r
DWORD dwChunkOffset; // Position of chunk\r
DWORD dwChunkLength; // Length of chunk\r
} AVIINDEXENTRY;\r
+
+#define AVISTREAMREAD_CONVENIENT (-1L)\r
\r
/*\r
** Palette change chunk\r
**\r
** Used in video streams.\r
*/\r
-#endif /* NOAVIFMT */\r
\ No newline at end of file
+#endif /* NOAVIFMT */\r
+#endif
+/********************************************************
+
+ Declaration of registry access functions
+ Copyright 2000 Eugene Smith (divx@euro.ru)
+ Last modified: 18.06.2000
+
+*********************************************************/
+
+
#ifndef REGISTRY_H
#define REGISTRY_H
#ifdef __cplusplus
extern "C" {
#endif
-long RegOpenKeyExA(long key, char* subkey, long reserved, long access, int* newkey);
+long RegOpenKeyExA(long key, const char* subkey, long reserved, long access, int* newkey);
long RegCloseKey(long key);
-long RegQueryValueExA(long key, char* value, int* reserved, int* type, int* data, int* count);
-long RegCreateKeyExA(long key, char* name, long reserved,\r
+long RegQueryValueExA(long key, const char* value, int* reserved, int* type, int* data, int* count);
+long RegCreateKeyExA(long key, const char* name, long reserved,\r
void* classs, long options, long security,\r
void* sec_attr, int* newkey, int* status) ;
-long RegSetValueExA(long key, char* name, long v1, long v2, void* data, long size);
+long RegSetValueExA(long key, const char* name, long v1, long v2, void* data, long size);
#ifdef __cplusplus
};
#endif
#define ICCompressGetFormat(hic, lpbiInput, lpbiOutput) \
- ICSendMessage( \
+ ICSendMessage( \
hic,ICM_COMPRESS_GET_FORMAT,(long)(void*)(lpbiInput), \
(long)(void*)(lpbiOutput) \
)
#define ICCompressGetFormatSize(hic,lpbi) ICCompressGetFormat(hic,lpbi,NULL)
+#define ICGetDefaultKeyFrameRate(hic,lpint) \
+ ICSendMessage( \
+ hic, ICM_GETDEFAULTKEYFRAMERATE, \
+ (long)(void*)(lpint), \
+ 0 )
+
+#define ICGetDefaultQuality(hic,lpint) \
+ ICSendMessage( \
+ hic, ICM_GETDEFAULTQUALITY, \
+ (long)(void*)(lpint), \
+ 0 )
+
+
#define ICCompressBegin(hic, lpbiInput, lpbiOutput) \
ICSendMessage( \
hic, ICM_COMPRESS_BEGIN, (long)(void*)(lpbiInput), \
#define ZeroMemory RtlZeroMemory
#define CopyMemory RtlCopyMemory
-/* a few optimizations for i386/gcc */
-
-#if defined(__i386__) && defined(__GNUC__)
-
-extern inline PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare );
-extern inline PVOID WINAPI InterlockedCompareExchange( PVOID *dest, PVOID xchg, PVOID compare )
-{
- PVOID ret;
- __asm__ __volatile__( "lock; cmpxchgl %2,(%1)"
- : "=a" (ret) : "r" (dest), "r" (xchg), "0" (compare) : "memory" );
- return ret;
-}
-
-extern inline LONG WINAPI InterlockedExchange( PLONG dest, LONG val );
-extern inline LONG WINAPI InterlockedExchange( PLONG dest, LONG val )
-{
- LONG ret;
- __asm__ __volatile__( "lock; xchgl %0,(%1)"
- : "=r" (ret) :"r" (dest), "0" (val) : "memory" );
- return ret;
-}
-
-extern inline LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr );
-extern inline LONG WINAPI InterlockedExchangeAdd( PLONG dest, LONG incr )
-{
- LONG ret;
- __asm__ __volatile__( "lock; xaddl %0,(%1)"
- : "=r" (ret) : "r" (dest), "0" (incr) : "memory" );
- return ret;
-}
-
-extern inline LONG WINAPI InterlockedIncrement( PLONG dest );
-extern inline LONG WINAPI InterlockedIncrement( PLONG dest )
-{
- return InterlockedExchangeAdd( dest, 1 ) + 1;
-}
-
-extern inline LONG WINAPI InterlockedDecrement( PLONG dest );
-extern inline LONG WINAPI InterlockedDecrement( PLONG dest )
-{
- return InterlockedExchangeAdd( dest, -1 ) - 1;
-}
-
-extern inline DWORD WINAPI GetLastError(void);
-extern inline DWORD WINAPI GetLastError(void)
-{
- DWORD ret;
- __asm__ __volatile__( ".byte 0x64\n\tmovl 0x60,%0" : "=r" (ret) );
- return ret;
-}
-
-extern inline DWORD WINAPI GetCurrentProcessId(void);
-extern inline DWORD WINAPI GetCurrentProcessId(void)
-{
- DWORD ret;
- __asm__ __volatile__( ".byte 0x64\n\tmovl 0x20,%0" : "=r" (ret) );
- return ret;
-}
-
-extern inline DWORD WINAPI GetCurrentThreadId(void);
-extern inline DWORD WINAPI GetCurrentThreadId(void)
-{
- DWORD ret;
- __asm__ __volatile__( ".byte 0x64\n\tmovl 0x24,%0" : "=r" (ret) );
- return ret;
-}
-
-extern inline void WINAPI SetLastError( DWORD err );
-extern inline void WINAPI SetLastError( DWORD err )
-{
- __asm__ __volatile__( ".byte 0x64\n\tmovl %0,0x60" : : "r" (err) : "memory" );
-}
-
-extern inline HANDLE WINAPI GetProcessHeap(void);
-extern inline HANDLE WINAPI GetProcessHeap(void)
-{
- HANDLE *pdb;
- __asm__ __volatile__( ".byte 0x64\n\tmovl 0x30,%0" : "=r" (pdb) );
- return pdb[0x18 / sizeof(HANDLE)]; /* get dword at offset 0x18 in pdb */
-}
-
-#else /* __i386__ && __GNUC__ */
DWORD WINAPI GetCurrentProcessId(void);
DWORD WINAPI GetCurrentThreadId(void);
DWORD WINAPI GetLastError(void);
LONG WINAPI InterlockedExchangeAdd(PLONG,LONG);
LONG WINAPI InterlockedIncrement(PLONG);
VOID WINAPI SetLastError(DWORD);
-#endif /* __i386__ && __GNUC__ */
#ifdef __WINE__
#define GetCurrentProcess() ((HANDLE)0xffffffff)
typedef long LONG;
typedef short SHORT;
typedef unsigned short USHORT;
-#ifdef CHAR
-#warning CHAR defined as $(CHAR)
-#endif
typedef char CHAR;
typedef unsigned char UCHAR;
+
+typedef LONG SCODE;\r
+
/* Some systems might have wchar_t, but we really need 16 bit characters */
typedef unsigned short WCHAR;
typedef int WIN_BOOL;