[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[244] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[244] mplayerxp
|
From: <nic...@us...> - 2012-10-29 11:39:09
|
Revision: 244
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=244&view=rev
Author: nickols_k
Date: 2012-10-29 11:38:55 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
move uncommon stuff into osdep
Modified Paths:
--------------
mplayerxp/Makefile
mplayerxp/libao2/ao_null.c
mplayerxp/libao2/ao_wav.c
mplayerxp/libmpcodecs/ad_a52.c
mplayerxp/libmpcodecs/ad_dca.c
mplayerxp/libmpcodecs/ad_dvdpcm.c
mplayerxp/libmpcodecs/ad_faad.c
mplayerxp/libmpcodecs/ad_ffmp3.c
mplayerxp/libmpcodecs/ad_hwac3.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/ad_qtaudio.c
mplayerxp/libmpcodecs/dec_video.c
mplayerxp/libmpcodecs/liba52/downmix.c
mplayerxp/libmpcodecs/liba52/imdct.c
mplayerxp/libmpcodecs/liba52/resample.c
mplayerxp/libmpcodecs/libdca/downmix.c
mplayerxp/libmpcodecs/libdca/resample.c
mplayerxp/libmpcodecs/libnuppelvideo/minilzo.c
mplayerxp/libmpcodecs/vd_ffmpeg.c
mplayerxp/libmpcodecs/vd_libmpeg2.c
mplayerxp/libmpcodecs/vd_qtvideo.c
mplayerxp/libmpcodecs/vd_xanim.c
mplayerxp/libmpdemux/asf.h
mplayerxp/libmpdemux/aviheader.h
mplayerxp/libmpdemux/cache2.c
mplayerxp/libmpdemux/demux_aiff.c
mplayerxp/libmpdemux/demux_asf.c
mplayerxp/libmpdemux/demux_audio.c
mplayerxp/libmpdemux/demux_avi.c
mplayerxp/libmpdemux/demux_film.c
mplayerxp/libmpdemux/demux_mkv.c
mplayerxp/libmpdemux/demux_mov.c
mplayerxp/libmpdemux/demux_mpg.c
mplayerxp/libmpdemux/demux_mpxp64.c
mplayerxp/libmpdemux/demux_ogg.c
mplayerxp/libmpdemux/demux_pva.c
mplayerxp/libmpdemux/demux_ra.c
mplayerxp/libmpdemux/demux_real.c
mplayerxp/libmpdemux/demux_smjpeg.c
mplayerxp/libmpdemux/demux_ts.c
mplayerxp/libmpdemux/demux_ty.c
mplayerxp/libmpdemux/demux_viv.c
mplayerxp/libmpdemux/demux_vqf.c
mplayerxp/libmpdemux/demux_y4m.c
mplayerxp/libmpdemux/mux_lavf.c
mplayerxp/libmpdemux/mux_mpxp64.c
mplayerxp/libmpdemux/mux_raw.c
mplayerxp/libmpdemux/pnm.c
mplayerxp/libmpdemux/realrtsp/md5.c
mplayerxp/libmpdemux/realrtsp/real.c
mplayerxp/libmpdemux/realrtsp/rmff.c
mplayerxp/libvo/aclib.c
mplayerxp/libvo/osd.c
mplayerxp/libvo/video_out.c
mplayerxp/libvo/vo_vesa.c
mplayerxp/loader/win32.c
mplayerxp/mplayer.c
mplayerxp/osdep/Makefile
mplayerxp/osdep/lrmi.c
mplayerxp/osdep/vbelib.c
mplayerxp/postproc/af_format.c
mplayerxp/postproc/af_mp.c
mplayerxp/postproc/af_mp.h
mplayerxp/postproc/af_raw.c
mplayerxp/postproc/dsp.c
mplayerxp/postproc/postprocess.c
mplayerxp/postproc/swscale.c
mplayerxp/postproc/vf_delogo.c
mplayerxp/postproc/vf_down3dright.c
mplayerxp/postproc/vf_eq.c
mplayerxp/postproc/vf_framestep.c
mplayerxp/postproc/vf_noise.c
mplayerxp/postproc/vf_pp.c
mplayerxp/postproc/vf_scale.c
mplayerxp/postproc/vf_unsharp.c
Added Paths:
-----------
mplayerxp/osdep/bswap.h
mplayerxp/osdep/cpudetect.c
mplayerxp/osdep/cpudetect.h
mplayerxp/osdep/cputable.h
mplayerxp/osdep/mangle.h
mplayerxp/osdep/mm_accel.h
Removed Paths:
-------------
mplayerxp/bswap.h
mplayerxp/cpudetect.c
mplayerxp/cpudetect.h
mplayerxp/cputable.h
mplayerxp/libmpcodecs/liba52/mangle.h
mplayerxp/libmpcodecs/libdca/mangle.h
mplayerxp/libmpdemux/bswap.h
mplayerxp/mangle.h
mplayerxp/mm_accel.h
Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/Makefile 2012-10-29 11:38:55 UTC (rev 244)
@@ -23,7 +23,7 @@
MANDIR = ${prefix}/man
LDFLAGS += -Wl,-rpath,${CODECDIR}/codecs
-SRCS_COMMON = cpudetect.c mp_msg.c mp_image.c
+SRCS_COMMON = mp_msg.c mp_image.c
SRCS_MPLAYER = mplayer.c fifo.c $(SRCS_COMMON) mixer.c mp-opt-reg.c sig_hand.c dump.c
SRCS_MPLAYER+= xmp_core.c
Deleted: mplayerxp/bswap.h
===================================================================
--- mplayerxp/bswap.h 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/bswap.h 2012-10-29 11:38:55 UTC (rev 244)
@@ -1,199 +0,0 @@
-#ifndef __BSWAP_H__
-#define __BSWAP_H__
-
-#ifdef HAVE_CONFIG_H
-#include "mp_config.h"
-#endif
-
-#ifdef HAVE_BYTESWAP_H
-#include <byteswap.h>
-#else
-
-#include <inttypes.h> /* for __WORDSIZE */
-
-#define MAKE_FOURCC( ch0, ch1, ch2, ch3 ) \
- (((long)(unsigned char)(ch3) ) | \
- ( (long)(unsigned char)(ch2) << 8 ) | \
- ( (long)(unsigned char)(ch1) << 16 ) | \
- ( (long)(unsigned char)(ch0) << 24 ) )
-#define MAKE_TWOCC(ch0, ch1) \
- ((short)(unsigned char)(ch0) |\
- ((short)(unsigned char)(ch1) << 8))
-
-
-#if defined(__i386__)
-inline static unsigned short ByteSwap16(unsigned short x)
-{
- __asm("xchgb %b0,%h0" :
- "=q" (x) :
- "0" (x));
- return x;
-}
-#define bswap_16(x) ByteSwap16(x)
-
-inline static unsigned int ByteSwap32(unsigned int x)
-{
-#if __CPU__ > 386
- __asm("bswap %0":
- "=r" (x) :
-#else
- __asm("xchgb %b0,%h0\n"
- " rorl $16,%0\n"
- " xchgb %b0,%h0":
- "=q" (x) :
-#endif
- "0" (x));
- return x;
-}
-#define bswap_32(x) ByteSwap32(x)
-
-inline static unsigned long long int ByteSwap64(unsigned long long int x)
-{
- register union { __extension__ unsigned long long int __ll;
- unsigned long int __l[2]; } __x;
- asm("xchgl %0,%1":
- "=r"(__x.__l[0]),"=r"(__x.__l[1]):
- "0"(bswap_32((unsigned long)x)),"1"(bswap_32((unsigned long)(x>>32))));
- return __x.__ll;
-}
-#define bswap_64(x) ByteSwap64(x)
-
-#elif defined(__x86_64__)
-
-inline static unsigned short ByteSwap16(unsigned short x)
-{
- __asm("rorw $8, %w0" :
- "=r" (x) :
- "0" (x) :
- "cc");
- return x;
-}
-#define bswap_16(x) ByteSwap16(x)
-
-inline static unsigned int ByteSwap32(unsigned int x)
-{
- __asm("bswapl %0":
- "=r" (x) :
- "0" (x));
- return x;
-}
-#define bswap_32(x) ByteSwap32(x)
-
-inline static unsigned long long int ByteSwap64(unsigned long long int x)
-{
- __asm("bswapq %0":
- "=r" (x) :
- "0" (x));
- return x;
-}
-#define bswap_64(x) ByteSwap64(x)
-
-#else
-
-#define bswap_16(x) (((x) & 0x00ff) << 8 | ((x) & 0xff00) >> 8)
-
-
-// code from bits/byteswap.h (C) 1997, 1998 Free Software Foundation, Inc.
-#define bswap_32(x) \
- ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
- (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
-
-#if __WORDSIZE >= 64
-# define bswap_64(x) \
- ((((x) & 0xff00000000000000ull) >> 56) \
- | (((x) & 0x00ff000000000000ull) >> 40) \
- | (((x) & 0x0000ff0000000000ull) >> 24) \
- | (((x) & 0x000000ff00000000ull) >> 8) \
- | (((x) & 0x00000000ff000000ull) << 8) \
- | (((x) & 0x0000000000ff0000ull) << 24) \
- | (((x) & 0x000000000000ff00ull) << 40) \
- | (((x) & 0x00000000000000ffull) << 56))
-#else
-#define bswap_64(x) \
- (__extension__ \
- ({ union { __extension__ unsigned long long int __ll; \
- unsigned long int __l[2]; } __w, __r; \
- __w.__ll = (x); \
- __r.__l[0] = bswap_32 (__w.__l[1]); \
- __r.__l[1] = bswap_32 (__w.__l[0]); \
- __r.__ll; }))
-#endif
-#endif /* !ARCH_X86 */
-
-#endif /* !HAVE_BYTESWAP_H */
-
-inline static float bswap_flt(float x) {
- union {uint32_t i; float f;} u;
- u.f = x;
- u.i = bswap_32(u.i);
- return u.f;
-}
-
-inline static double bswap_dbl(double x) {
- union {uint64_t i; double d;} u;
- u.d = x;
- u.i = bswap_64(u.i);
- return u.d;
-}
-
-inline static long double bswap_ldbl(long double x) {
- union {char d[10]; long double ld;} uin;
- union {char d[10]; long double ld;} uout;
- uin.ld = x;
- uout.d[0] = uin.d[9];
- uout.d[1] = uin.d[8];
- uout.d[2] = uin.d[7];
- uout.d[3] = uin.d[6];
- uout.d[4] = uin.d[5];
- uout.d[5] = uin.d[4];
- uout.d[6] = uin.d[3];
- uout.d[7] = uin.d[2];
- uout.d[8] = uin.d[1];
- uout.d[9] = uin.d[0];
- return uout.ld;
-}
-
-// be2me ... BigEndian to MachineEndian
-// le2me ... LittleEndian to MachineEndian
-
-#ifdef WORDS_BIGENDIAN
-#define be2me_16(x) (x)
-#define be2me_32(x) (x)
-#define be2me_64(x) (x)
-#define me2be_16(x) (x)
-#define me2be_32(x) (x)
-#define me2be_64(x) (x)
-#define le2me_16(x) bswap_16(x)
-#define le2me_32(x) bswap_32(x)
-#define le2me_64(x) bswap_64(x)
-#define me2le_16(x) bswap_16(x)
-#define me2le_32(x) bswap_32(x)
-#define me2le_64(x) bswap_64(x)
-#define be2me_flt(x) (x)
-#define be2me_dbl(x) (x)
-#define be2me_ldbl(x) (x)
-#define le2me_flt(x) bswap_flt(x)
-#define le2me_dbl(x) bswap_dbl(x)
-#define le2me_ldbl(x) bswap_ldbl(x)
-#else
-#define be2me_16(x) bswap_16(x)
-#define be2me_32(x) bswap_32(x)
-#define be2me_64(x) bswap_64(x)
-#define me2be_16(x) bswap_16(x)
-#define me2be_32(x) bswap_32(x)
-#define me2be_64(x) bswap_64(x)
-#define le2me_16(x) (x)
-#define le2me_32(x) (x)
-#define le2me_64(x) (x)
-#define me2le_16(x) (x)
-#define me2le_32(x) (x)
-#define me2le_64(x) (x)
-#define be2me_flt(x) bswap_flt(x)
-#define be2me_dbl(x) bswap_dbl(x)
-#define be2me_ldbl(x) bswap_ldbl(x)
-#define le2me_flt(x) (x)
-#define le2me_dbl(x) (x)
-#define le2me_ldbl(x) (x)
-#endif
-
-#endif
Deleted: mplayerxp/cpudetect.c
===================================================================
--- mplayerxp/cpudetect.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/cpudetect.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -1,373 +0,0 @@
-#include "mp_config.h"
-#include "cpudetect.h"
-#include "help_mp.h"
-#define MSGT_CLASS MSGT_CPUDETECT
-#include "__mp_msg.h"
-CpuCaps gCpuCaps;
-
-#ifdef HAVE_MALLOC
-#include <malloc.h>
-#endif
-#include <stdlib.h>
-#include <string.h>
-
-#if defined( ARCH_X86 ) || defined(ARCH_X86_64)
-
-#include <stdio.h>
-
-#ifdef __FreeBSD__
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#endif
-
-#ifdef __linux__
-#include <signal.h>
-#endif
-
-//#define X86_FXSR_MAGIC
-/* Thanks to the FreeBSD project for some of this cpuid code, and
- * help understanding how to use it. Thanks to the Mesa
- * team for SSE support detection and more cpu detect code.
- */
-
-/* I believe this code works. However, it has only been used on a PII and PIII */
-
-static void check_os_katmai_support( void );
-
-// return TRUE if cpuid supported
-static int has_cpuid()
-{
-#ifdef ARCH_X86_64
- return 1;
-#else
- int a, c;
-// code from libavcodec:
- __asm__ __volatile__ (
- /* See if CPUID instruction is supported ... */
- /* ... Get copies of EFLAGS into eax and ecx */
- "pushf\n\t"
- "pop %0\n\t"
- "mov %0, %1\n\t"
- /* ... Toggle the ID bit in one copy and store */
- /* to the EFLAGS reg */
- "xor $0x200000, %0\n\t"
- "push %0\n\t"
- "popf\n\t"
- /* ... Get the (hopefully modified) EFLAGS */
- "pushf\n\t"
- "pop %0\n\t"
- : "=a" (a), "=c" (c)
- :
- : "cc"
- );
- return (a!=c);
-#endif
-}
-
-static void
-do_cpuid(unsigned int ax, unsigned int *p)
-{
- __asm __volatile(
- "cpuid;"
- : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3])
- : "0" (ax)
- );
-}
-
-void GetCpuCaps( CpuCaps *caps)
-{
- unsigned int regs[4];
- unsigned int regs2[4];
-
- memset(caps, 0, sizeof(*caps));
- caps->isX86=1;
- caps->cl_size=32; /* default */
- if (!has_cpuid()) {
- MSG_WARN("CPUID not supported!???\n");
- return;
- }
- do_cpuid(0x00000000, regs); // get _max_ cpuid level and vendor name
- MSG_V("CPU vendor name: %.4s%.4s%.4s max cpuid level: %d\n",
- (char*) (regs+1),(char*) (regs+3),(char*) (regs+2), regs[0]);
- if (regs[0]>=0x00000001)
- {
- char *tmpstr;
- unsigned cl_size;
-
- do_cpuid(0x00000001, regs2);
-
- tmpstr=GetCpuFriendlyName(regs, regs2);
- MSG_V("CPU: %s ",tmpstr);
- free(tmpstr);
-
- caps->cpuType=(regs2[0] >> 8)&0xf;
- if(caps->cpuType==0xf){
- // use extended family (P4, IA64)
- caps->cpuType=8+((regs2[0]>>20)&255);
- }
- caps->cpuStepping=regs2[0] & 0xf;
- MSG_V("(Type: %d, Stepping: %d)\n",
- caps->cpuType, caps->cpuStepping);
-
- // general feature flags:
- caps->hasMMX = (regs2[3] & (1 << 23 )) >> 23; // 0x0800000
- caps->hasSSE = (regs2[3] & (1 << 25 )) >> 25; // 0x2000000
- caps->hasSSE2 = (regs2[3] & (1 << 26 )) >> 26; // 0x4000000
- caps->hasSSE3 = (regs2[2] & 1); // 0x0000001
- caps->hasSSSE3 =(regs2[2] & (1 << 9 )) >> 9; // 0x0000100
- caps->hasFMA = (regs2[2] & (1 << 12 )) >>12; // 0x0000800
- caps->hasSSE41 =(regs2[2] & (1 << 19 )) >>19; // 0x0080000
- caps->hasSSE42 =(regs2[2] & (1 << 20 )) >>20; // 0x0100000
- caps->hasAES =(regs2[2] & (1 << 25 )) >>25; // 0x02000000
- caps->hasAVX =(regs2[2] & (1 << 28 )) >>28; // 0x10000000
- caps->hasMMX2 = caps->hasSSE; // SSE cpus supports mmxext too
- cl_size = ((regs2[1] >> 8) & 0xFF)*8;
- if(cl_size) caps->cl_size = cl_size;
- }
- do_cpuid(0x80000000, regs);
- if (regs[0]>=0x80000001) {
- MSG_V("extended cpuid-level: %d\n",regs[0]&0x7FFFFFFF);
- do_cpuid(0x80000001, regs2);
- caps->hasMMX |= (regs2[3] & (1 << 23 )) >> 23; // 0x0800000
- caps->hasMMX2 |= (regs2[3] & (1 << 22 )) >> 22; // 0x400000
- caps->has3DNow = (regs2[3] & (1 << 31 )) >> 31; //0x80000000
- caps->has3DNowExt = (regs2[3] & (1 << 30 )) >> 30;
- }
- if(regs[0]>=0x80000006)
- {
- do_cpuid(0x80000006, regs2);
- MSG_V("extended cache-info: %d\n",regs2[2]);
- caps->cl_size = regs2[2] & 0xFF;
- }
- MSG_V("Detected cache-line size is %u bytes\n",caps->cl_size);
- MSG_V("cpudetect: MMX=%d MMX2=%d 3DNow=%d 3DNow2=%d SSE=%d SSE2=%d SSE3=%d SSSE3=%d SSE41=%d SSE42=%d AES=%d AVX=%d FMA=%d\n",
- gCpuCaps.hasMMX,
- gCpuCaps.hasMMX2,
- gCpuCaps.has3DNow,
- gCpuCaps.has3DNowExt,
- gCpuCaps.hasSSE,
- gCpuCaps.hasSSE2,
- gCpuCaps.hasSSE3,
- gCpuCaps.hasSSSE3,
- gCpuCaps.hasSSE41,
- gCpuCaps.hasSSE42,
- gCpuCaps.hasAES,
- gCpuCaps.hasAVX,
- gCpuCaps.hasFMA
-);
-}
-
-
-#define CPUID_EXTFAMILY ((regs2[0] >> 20)&0xFF) /* 27..20 */
-#define CPUID_EXTMODEL ((regs2[0] >> 16)&0x0F) /* 19..16 */
-#define CPUID_TYPE ((regs2[0] >> 12)&0x04) /* 13..12 */
-#define CPUID_FAMILY ((regs2[0] >> 8)&0x0F) /* 11..08 */
-#define CPUID_MODEL ((regs2[0] >> 4)&0x0F) /* 07..04 */
-#define CPUID_STEPPING ((regs2[0] >> 0)&0x0F) /* 03..00 */
-
-char *GetCpuFriendlyName(unsigned int regs[], unsigned int regs2[]){
-#include "cputable.h" /* get cpuname and cpuvendors */
- char vendor[17];
- char *retname;
- int i;
-
- if (NULL==(retname=(char*)malloc(256))) {
- MSG_ERR(MSGTR_OutOfMemory);
- exit(1);
- }
-
- sprintf(vendor,"%.4s%.4s%.4s",(char*)(regs+1),(char*)(regs+3),(char*)(regs+2));
-
- for(i=0; i<MAX_VENDORS; i++){
- if(!strcmp(cpuvendors[i].string,vendor)){
- if(cpuname[i][CPUID_FAMILY][CPUID_MODEL]){
- snprintf(retname,255,"%s %s",cpuvendors[i].name,cpuname[i][CPUID_FAMILY][CPUID_MODEL]);
- } else {
- snprintf(retname,255,"unknown %s %d. Generation CPU",cpuvendors[i].name,CPUID_FAMILY);
- MSG_ERR("unknown %s CPU:\n"
- "Vendor: %s\n"
- "Type: %d\n"
- "Family: %d (ext: %d)\n"
- "Model: %d (ext: %d)\n"
- "Stepping: %d\n"
- "Please send the above info along with the exact CPU name"
- "to the MPlayer-Developers, so we can add it to the list!\n"
- ,cpuvendors[i].name
- ,cpuvendors[i].string
- ,CPUID_TYPE
- ,CPUID_FAMILY,CPUID_EXTFAMILY
- ,CPUID_MODEL,CPUID_EXTMODEL
- ,CPUID_STEPPING);
- }
- }
- }
-
- //printf("Detected CPU: %s\n", retname);
- return retname;
-}
-
-#undef CPUID_EXTFAMILY
-#undef CPUID_EXTMODEL
-#undef CPUID_TYPE
-#undef CPUID_FAMILY
-#undef CPUID_MODEL
-#undef CPUID_STEPPING
-
-
-#if defined(__linux__) && defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
-static void sigill_handler_sse( int signal, struct sigcontext sc )
-{
- MSG_ERR( "SIGILL, " );
-
- /* Both the "xorps %%xmm0,%%xmm0" and "divps %xmm0,%%xmm1"
- * instructions are 3 bytes long. We must increment the instruction
- * pointer manually to avoid repeated execution of the offending
- * instruction.
- *
- * If the SIGILL is caused by a divide-by-zero when unmasked
- * exceptions aren't supported, the SIMD FPU status and control
- * word will be restored at the end of the test, so we don't need
- * to worry about doing it here. Besides, we may not be able to...
- */
- sc.eip += 3;
-
- gCpuCaps.hasSSE=0;
-}
-
-static void sigfpe_handler_sse( int signal, struct sigcontext sc )
-{
- MSG_ERR( "SIGFPE, " );
-
- if ( sc.fpstate->magic != 0xffff ) {
- /* Our signal context has the extended FPU state, so reset the
- * divide-by-zero exception mask and clear the divide-by-zero
- * exception bit.
- */
- sc.fpstate->mxcsr |= 0x00000200;
- sc.fpstate->mxcsr &= 0xfffffffb;
- } else {
- /* If we ever get here, we're completely hosed.
- */
- MSG_ERR( "\n\n" );
- MSG_ERR( "SSE enabling test failed badly!" );
- }
-}
-#endif /* __linux__ && _POSIX_SOURCE && X86_FXSR_MAGIC */
-
-/* If we're running on a processor that can do SSE, let's see if we
- * are allowed to or not. This will catch 2.4.0 or later kernels that
- * haven't been configured for a Pentium III but are running on one,
- * and RedHat patched 2.2 kernels that have broken exception handling
- * support for user space apps that do SSE.
- */
-static void check_os_katmai_support( void )
-{
-#if !defined(ARCH_X86_64)
-#if defined(__FreeBSD__)
- int has_sse=0, ret;
- size_t len=sizeof(has_sse);
-
- ret = sysctlbyname("hw.instruction_sse", &has_sse, &len, NULL, 0);
- if (ret || !has_sse)
- gCpuCaps.hasSSE=0;
-
-#elif defined(__linux__)
-#if defined(_POSIX_SOURCE) && defined(X86_FXSR_MAGIC)
- struct sigaction saved_sigill;
- struct sigaction saved_sigfpe;
-
- /* Save the original signal handlers.
- */
- sigaction( SIGILL, NULL, &saved_sigill );
- sigaction( SIGFPE, NULL, &saved_sigfpe );
-
- signal( SIGILL, (void (*)(int))sigill_handler_sse );
- signal( SIGFPE, (void (*)(int))sigfpe_handler_sse );
-
- /* Emulate test for OSFXSR in CR4. The OS will set this bit if it
- * supports the extended FPU save and restore required for SSE. If
- * we execute an SSE instruction on a PIII and get a SIGILL, the OS
- * doesn't support Streaming SIMD Exceptions, even if the processor
- * does.
- */
- if ( gCpuCaps.hasSSE ) {
- MSG_V( "Testing OS support for SSE... " );
-
-// __asm __volatile ("xorps %%xmm0, %%xmm0");
- __asm __volatile ("xorps %xmm0, %xmm0");
-
- if ( gCpuCaps.hasSSE ) {
- MSG_V( "yes.\n" );
- } else {
- MSG_V( "no!\n" );
- }
- }
-
- /* Emulate test for OSXMMEXCPT in CR4. The OS will set this bit if
- * it supports unmasked SIMD FPU exceptions. If we unmask the
- * exceptions, do a SIMD divide-by-zero and get a SIGILL, the OS
- * doesn't support unmasked SIMD FPU exceptions. If we get a SIGFPE
- * as expected, we're okay but we need to clean up after it.
- *
- * Are we being too stringent in our requirement that the OS support
- * unmasked exceptions? Certain RedHat 2.2 kernels enable SSE by
- * setting CR4.OSFXSR but don't support unmasked exceptions. Win98
- * doesn't even support them. We at least know the user-space SSE
- * support is good in kernels that do support unmasked exceptions,
- * and therefore to be safe I'm going to leave this test in here.
- */
- if ( gCpuCaps.hasSSE ) {
- MSG_V( "Testing OS support for SSE unmasked exceptions... " );
-
-// test_os_katmai_exception_support();
-
- if ( gCpuCaps.hasSSE ) {
- MSG_V( "yes.\n" );
- } else {
- MSG_V( "no!\n" );
- }
- }
-
- /* Restore the original signal handlers.
- */
- sigaction( SIGILL, &saved_sigill, NULL );
- sigaction( SIGFPE, &saved_sigfpe, NULL );
-
- /* If we've gotten to here and the XMM CPUID bit is still set, we're
- * safe to go ahead and hook out the SSE code throughout Mesa.
- */
- if ( gCpuCaps.hasSSE ) {
- MSG_V( "Tests of OS support for SSE passed.\n" );
- } else {
- MSG_WARN( "Tests of OS support for SSE failed!\n" );
- }
-#else
- /* We can't use POSIX signal handling to test the availability of
- * SSE, so we disable it by default.
- */
- MSG_WARN( "Cannot test OS support for SSE, disabling to be safe.\n" );
- gCpuCaps.hasSSE=0;
-#endif /* _POSIX_SOURCE && X86_FXSR_MAGIC */
-#else
- /* Do nothing on other platforms for now.
- */
- MSG_V( "Not testing OS support for SSE, leaving disabled.\n" );
- gCpuCaps.hasSSE=0;
-#endif /* __linux__ */
-#endif /*ARCH_X86_64*/
-}
-#else /* ARCH_X86 */
-
-void GetCpuCaps( CpuCaps *caps)
-{
- caps->cpuType=0;
- caps->cpuStepping=0;
- caps->hasMMX=0;
- caps->hasMMX2=0;
- caps->has3DNow=0;
- caps->has3DNowExt=0;
- caps->hasSSE=0;
- caps->hasSSE2=0;
- caps->isX86=0;
-}
-#endif /* !ARCH_X86 */
Deleted: mplayerxp/cpudetect.h
===================================================================
--- mplayerxp/cpudetect.h 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/cpudetect.h 2012-10-29 11:38:55 UTC (rev 244)
@@ -1,67 +0,0 @@
-#ifndef CPUDETECT_H
-#define CPUDETECT_H
-
-#include "mplayer.h"
-
-#ifdef ARCH_X86_64
-# define REGa rax
-# define REGb rbx
-# define REGBP rbp
-# define REGSP rsp
-# define REG_a "rax"
-# define REG_b "rbx"
-# define REG_c "rcx"
-# define REG_d "rdx"
-# define REG_S "rsi"
-# define REG_D "rdi"
-# define REG_SP "rsp"
-# define REG_BP "rbp"
-#else
-# define REGa eax
-# define REGb ebx
-# define REGBP ebp
-# define REGSP esp
-# define REG_a "eax"
-# define REG_b "ebx"
-# define REG_c "ecx"
-# define REG_d "edx"
-# define REG_S "esi"
-# define REG_D "edi"
-# define REG_SP "esp"
-# define REG_BP "ebp"
-#endif
-
-#define CPUTYPE_I386 3
-#define CPUTYPE_I486 4
-#define CPUTYPE_I586 5
-#define CPUTYPE_I686 6
-
-typedef struct cpucaps_s {
- int cpuType;
- int cpuStepping;
- int hasMMX;
- int hasMMX2;
- int has3DNow;
- int has3DNowExt;
- int hasSSE;
- int hasSSE2;
- int hasSSE3;
- int hasSSSE3;
- int hasFMA;
- int hasSSE41;
- int hasSSE42;
- int hasAES;
- int hasAVX;
- int isX86;
- unsigned cl_size; /* size of cache line */
-} CpuCaps;
-
-extern CpuCaps gCpuCaps;
-
-void GetCpuCaps(CpuCaps *caps);
-
-/* returned value is malloc()'ed so free() it after use */
-char *GetCpuFriendlyName(unsigned int regs[], unsigned int regs2[]);
-
-#endif /* !CPUDETECT_H */
-
Deleted: mplayerxp/cputable.h
===================================================================
--- mplayerxp/cputable.h 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/cputable.h 2012-10-29 11:38:55 UTC (rev 244)
@@ -1,474 +0,0 @@
-/* cputable.h - Maps CPUID to real CPU name.
- * Copyleft 2001 by Felix Buenemann <atmosfear at users dot sourceforge dot net>
- * This file comes under the GNU GPL, see www.fsf.org for more info!
- */
-
-#define MAX_VENDORS 8 /* Number of CPU Vendors */
-
-//#define N_UNKNOWN "unknown"
-//#define N_UNKNOWNEXT "unknown extended model"
-#define N_UNKNOWN ""
-#define N_UNKNOWNEXT ""
-
-#define F_UNKNOWN { \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN, \
-N_UNKNOWN \
-}
-
-static const char *cpuname
- /* Vendor */ [MAX_VENDORS]
- /* Family */ [16]
- /* Model */ [16]
- ={
- /* Intel Corporation, "GenuineIntel" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 i386 */ F_UNKNOWN, /* XXX new 386 chips may support CPUID! */
- /* 4 i486 */ {
- /* 0 */ "i486DX-25/33", /* only few of these */
- /* 1 */ "i486DX-50", /* support CPUID! */
- /* 2 */ "i486SX",
- /* 3 */ "i486DX2", /* CPUID only on new chips! */
- /* 4 */ "i486SL",
- /* 5 */ "i486SX2",
- /* 6 */ N_UNKNOWN,
- /* 7 */ "i486DX2/write-back", /* returns 3 in write-through mode */
- /* 8 */ "i486DX4",
- /* 9 */ "i486DX4/write-back",
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- },
- /* 5 i586 */ {
- /* 0 */ "Pentium P5 A-step",
- /* 1 */ "Pentium P5",
- /* 2 */ "Pentium P54C",
- /* 3 */ "Pentium OverDrive P24T",
- /* 4 */ "Pentium MMX P55C",
- /* 5 */ N_UNKNOWN, /* XXX DX4 OverDrive? */
- /* 6 */ N_UNKNOWN, /* XXX P5 OverDrive? */
- /* 7 */ "Pentium P54C (new)",
- /* 8 */ "Pentium MMX P55C (new)",
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- },
- /* 6 i686 */ {
- /* 0 */ "PentiumPro A-step",
- /* 1 */ "PentiumPro",
- /* 2 */ N_UNKNOWN,
- /* 3 */ "Pentium II Klamath/Pentium II OverDrive",
- /* 4 */ N_UNKNOWN, /* XXX P55CT - OverDrive for P54? */
- /* 5 */ "Celeron Covington/Pentium II Deschutes,Tonga/Pentium II Xeon",
- /* 6 */ "Celeron A Mendocino/Pentium II Dixon",
- /* 7 */ "Pentium III Katmai/Pentium III Xeon Tanner",
- /* 8 */ "Celeron 2/Pentium III Coppermine,Geyserville",
- /* 9 */ N_UNKNOWN,
- /* A */ "Pentium III Xeon Cascades",
- /* B */ "Celeron 2/Pentium III Tualatin",
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- },
- /* 7 IA-64 */ { /* FIXME */
- /* 0 */ N_UNKNOWN,
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- },
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F extended family (P4/new IA-64)*/ {
- /* 0 */ "Pentium 4 Willamette",
- /* 1 */ "Pentium 4 Xeon Foster", /*?*/
- /* XXX 0.13\xB5m P4 Northwood ??? */
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWNEXT
- }
- },
- /* United Microelectronics Corporation, "UMC UMC UMC " */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 486 (U5) */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ "486DX U5D",
- /* 2 */ "486SX U5S",
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 5 */ F_UNKNOWN,
- /* 6 */ F_UNKNOWN,
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* Advanced Micro Devices, "AuthenticAMD" (very rare: "AMD ISBETTER") */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 486/5x86 */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ "486DX2",
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ "486DX2/write-back",
- /* 8 */ "486DX4/5x86",
- /* 9 */ "486DX4/write-back",
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* E */ "5x86",
- /* F */ "5x86/write-back"
- },
- /* 5 K5/K6 */ {
- /* 0 */ "K5 SSA5 (PR75,PR90,PR100)",
- /* 1 */ "K5 5k86 (PR120,PR133)",
- /* 2 */ "K5 5k86 (PR166)",
- /* 3 */ "K5 5k86 (PR200)",
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ "K6",
- /* 7 */ "K6 Little Foot",
- /* 8 */ "K6-2",
- /* 9 */ "K6-III Chomper",
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ "K6-2+/K6-III+ Sharptooth",
- /* E */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 K7 */ {
- /* 0 */ N_UNKNOWN, /* Argon? */
- /* 1 */ "Athlon K7",
- /* 2 */ "Athlon K75 Pluto,Orion",
- /* 3 */ "Duron SF Spitfire",
- /* 4 */ "Athlon TB Thunderbird",
- /* 5 */ N_UNKNOWN,
- /* 6 */ "Athlon 4 PM Palomino/Athlon MP Multiprocessor/Athlon XP eXtreme Performance",
- /* 7 */ "Duron MG Morgan",
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* Cyrix Corp./VIA Inc., "CyrixInstead" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 5x86 */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ "MediaGX",
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ "5x86", /* CPUID maybe only on newer chips */
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 5 M1 */ {
- /* 0 */ "M1 test-sample", /*?*/
- /* 1 */ N_UNKNOWN,
- /* 2 */ "6x86 M1",
- /* 3 */ N_UNKNOWN,
- /* 4 */ "GXm",
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 M2 */ {
- /* 0 */ "6x86MX M2/M-II",
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ "Cyrix III Joshua (M2 core)",
- /* 6 */ "Cyrix III Samuel (WinChip C5A core)",
- /* 7 */ "C3 Samuel 2 (WinChip C5B core)",
- /* 8 */ N_UNKNOWN, /* XXX Samuel 3/Ezra? */
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* NexGen Inc., "NexGenDriven" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 */ F_UNKNOWN,
- /* 5 Nx586 */ {
- /* 0 */ "Nx586/Nx586FPU", /* only newer ones support CPUID! */
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 */ F_UNKNOWN,
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* IDT/Centaur/VIA, "CentaurHauls" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 */ F_UNKNOWN,
- /* 5 IDT C6 WinChip */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ "WinChip C6",
- /* 5 */ N_UNKNOWN,
- /* 6 */ "Samuel",
- /* 7 */ N_UNKNOWN,
- /* 8 */ "WinChip 2 C6+,W2,W2A,W2B",
- /* 9 */ "WinChip 3 W3",
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
-
- },
- /* 6 */ F_UNKNOWN,
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* Rise, "RiseRiseRise" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 */ F_UNKNOWN,
- /* 5 mP6 */ {
- /* 0 */ "mP6 iDragon 6401,6441 Kirin",
- /* 1 */ "mP6 iDragon 6510 Lynx",
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ N_UNKNOWN,
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ "mP6 iDragon II",
- /* 9 */ "mP6 iDragon II (new)",
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 */ F_UNKNOWN,
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- },
- /* Transmeta, "GenuineTMx86" */ {
- /* 0 */ F_UNKNOWN,
- /* 1 */ F_UNKNOWN,
- /* 2 */ F_UNKNOWN,
- /* 3 */ F_UNKNOWN,
- /* 4 */ F_UNKNOWN,
- /* 5 Crusoe */ {
- /* 0 */ N_UNKNOWN,
- /* 1 */ N_UNKNOWN,
- /* 2 */ N_UNKNOWN,
- /* 3 */ N_UNKNOWN,
- /* 4 */ "Crusoe TM3x00,TM5x00",
- /* 5 */ N_UNKNOWN,
- /* 6 */ N_UNKNOWN,
- /* 7 */ N_UNKNOWN,
- /* 8 */ N_UNKNOWN,
- /* 9 */ N_UNKNOWN,
- /* A */ N_UNKNOWN,
- /* B */ N_UNKNOWN,
- /* E */ N_UNKNOWN,
- /* C */ N_UNKNOWN,
- /* D */ N_UNKNOWN,
- /* F */ N_UNKNOWN
- },
- /* 6 */ F_UNKNOWN,
- /* 7 */ F_UNKNOWN,
- /* 8 */ F_UNKNOWN,
- /* 9 */ F_UNKNOWN,
- /* A */ F_UNKNOWN,
- /* B */ F_UNKNOWN,
- /* C */ F_UNKNOWN,
- /* D */ F_UNKNOWN,
- /* E */ F_UNKNOWN,
- /* F */ F_UNKNOWN
- }
-};
-
-#undef N_UNKNOWNEXT
-#undef N_UNKNOWN
-#undef F_UNKNOWN
-
-static const struct {
- char string[13];
- char name[48];
-} cpuvendors[MAX_VENDORS] ={
- {"GenuineIntel","Intel"},
- {"UMC UMC UMC ","United Microelectronics Corporation"},
- {"AuthenticAMD","Advanced Micro Devices"},
- {"CyrixInstead","Cyrix/VIA"},
- {"NexGenDriven","NexGen"},
- {"CentaurHauls","IDT/Centaur/VIA"},
- {"RiseRiseRise","Rise"},
- {"GenuineTMx86","Transmeta"}
-};
-
Modified: mplayerxp/libao2/ao_null.c
===================================================================
--- mplayerxp/libao2/ao_null.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libao2/ao_null.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -6,9 +6,9 @@
#include <sys/time.h>
#include "mp_config.h"
-#include "../bswap.h"
+#include "osdep/bswap.h"
-#include "../libmpdemux/mrl.h"
+#include "libmpdemux/mrl.h"
#include "afmt.h"
#include "audio_out.h"
#include "audio_out_internal.h"
Modified: mplayerxp/libao2/ao_wav.c
===================================================================
--- mplayerxp/libao2/ao_wav.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libao2/ao_wav.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -25,12 +25,12 @@
#include <string.h>
#include "xmp_core.h"
-#include "../bswap.h"
+#include "osdep/bswap.h"
#include "postproc/af_format.h"
#include "afmt.h"
#include "audio_out.h"
#include "audio_out_internal.h"
-#include "../libvo/video_out.h"
+#include "libvo/video_out.h"
#include "help_mp.h"
#include "ao_msg.h"
Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/ad_a52.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -9,15 +9,15 @@
#include "mp_config.h"
#include "help_mp.h"
-#include "cpudetect.h"
+#include "osdep/cpudetect.h"
-#include "../mm_accel.h"
-#include "../mplayer.h"
+#include "osdep/mm_accel.h"
+#include "mplayer.h"
#include "liba52/a52.h"
#include "ad_a52.h"
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
-#include "../postproc/af.h"
+#include "postproc/af.h"
#define MAX_AC3_FRAME 3840
@@ -25,7 +25,7 @@
uint32_t mpxp_a52_accel=0;
uint32_t mpxp_a52_flags=0;
-#include "bswap.h"
+#include "osdep/bswap.h"
static const ad_info_t info =
{
Modified: mplayerxp/libmpcodecs/ad_dca.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/ad_dca.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -9,15 +9,15 @@
#include "mp_config.h"
#include "help_mp.h"
-#include "cpudetect.h"
+#include "osdep/cpudetect.h"
#include "libdca/dca.h"
-#include "../mm_accel.h"
-#include "../mplayer.h"
-#include "../bswap.h"
+#include "osdep/mm_accel.h"
+#include "mplayer.h"
+#include "osdep/bswap.h"
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
-#include "../postproc/af.h"
+#include "postproc/af.h"
#define MAX_AC5_FRAME 4096
@@ -31,8 +31,6 @@
}dca_priv_t;
-#include "bswap.h"
-
static const ad_info_t info =
{
"DTS Coherent Acoustics",
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -2,8 +2,8 @@
#include <stdlib.h>
#include <unistd.h>
#include "ad_internal.h"
-#include "bswap.h"
-#include "../libao2/afmt.h"
+#include "osdep/bswap.h"
+#include "libao2/afmt.h"
static const ad_info_t info =
{
Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/ad_faad.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -11,16 +11,16 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "help_mp.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "codecs_ld.h"
#include "mp_config.h"
#include "ad_internal.h"
-#include "../mplayer.h"
-#include "../cpudetect.h"
-#include "../mm_accel.h"
+#include "mplayer.h"
+#include "osdep/cpudetect.h"
+#include "osdep/mm_accel.h"
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
-#include "../postproc/af.h"
+#include "postproc/af.h"
static const ad_info_t info =
{
Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -10,7 +10,7 @@
#include "mp_config.h"
#include "help_mp.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#define FF_API_OLD_DECODE_AUDIO 1
#include "libavcodec/avcodec.h"
Modified: mplayerxp/libmpcodecs/ad_hwac3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/ad_hwac3.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -10,9 +10,9 @@
#include "mp_config.h"
#include "help_mp.h"
#include "codecs_ld.h"
-#include "cpudetect.h"
+#include "osdep/cpudetect.h"
-#include "../libao2/afmt.h"
+#include "libao2/afmt.h"
#include "ad_a52.h"
#define IEC61937_DATA_TYPE_AC3 1
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -5,9 +5,9 @@
#include "ad_internal.h"
#include "libvo/fastmemcpy.h"
#include "mp_config.h"
-#include "../mplayer.h"
-#include "../cpudetect.h"
-#include "../mm_accel.h"
+#include "mplayer.h"
+#include "osdep/cpudetect.h"
+#include "osdep/mm_accel.h"
#include "codecs_ld.h"
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -6,11 +6,11 @@
#include "mp_config.h"
#include "ad_internal.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "codecs_ld.h"
-#include "../mplayer.h"
+#include "mplayer.h"
#ifdef WIN32_LOADER
-#include "../../loader/ldt_keeper.h"
+#include "loader/ldt_keeper.h"
#endif
#ifdef MACOSX
Modified: mplayerxp/libmpcodecs/dec_video.c
===================================================================
--- mplayerxp/libmpcodecs/dec_video.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/dec_video.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -10,7 +10,7 @@
#endif
#include <stdlib.h>
#include <unistd.h>
-#include "../mplayer.h"
+#include "mplayer.h"
#include "help_mp.h"
#include "osdep/timer.h"
@@ -38,7 +38,7 @@
vf_cfg_t vf_cfg; // Configuration for audio filters
#include "postproc/postprocess.h"
-#include "cpudetect.h"
+#include "osdep/cpudetect.h"
#include "vd_msg.h"
extern int v_bright;
Modified: mplayerxp/libmpcodecs/liba52/downmix.c
===================================================================
--- mplayerxp/libmpcodecs/liba52/downmix.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/liba52/downmix.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -21,15 +21,15 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../../mp_config.h"
+#include "mp_config.h"
#include <string.h>
#include <inttypes.h>
#include "a52.h"
#include "a52_internal.h"
-#include "../../mm_accel.h"
-#include "../../cpudetect.h"
+#include "osdep/mm_accel.h"
+#include "osdep/cpudetect.h"
#define CONVERT(acmod,output) (((output) << 3) + (acmod))
Modified: mplayerxp/libmpcodecs/liba52/imdct.c
===================================================================
--- mplayerxp/libmpcodecs/liba52/imdct.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/liba52/imdct.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -24,7 +24,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../../mp_config.h"
+#include "mp_config.h"
#include <math.h>
#include <stdio.h>
@@ -35,7 +35,7 @@
#include "a52.h"
#include "a52_internal.h"
-#include "../../mm_accel.h"
+#include "osdep/mm_accel.h"
typedef struct complex_s {
sample_t real;
Deleted: mplayerxp/libmpcodecs/liba52/mangle.h
===================================================================
--- mplayerxp/libmpcodecs/liba52/mangle.h 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/liba52/mangle.h 2012-10-29 11:38:55 UTC (rev 244)
@@ -1,2 +0,0 @@
-#include "../mangle.h"
-
Modified: mplayerxp/libmpcodecs/liba52/resample.c
===================================================================
--- mplayerxp/libmpcodecs/liba52/resample.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/liba52/resample.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -4,14 +4,14 @@
// a52_resample() should do the conversion.
-#include "../../mp_config.h"
+#include "mp_config.h"
#include <inttypes.h>
#include <stdio.h>
#include "a52.h"
#include "a52_internal.h"
-#include "../../mm_accel.h"
-#include "../../mangle.h"
-#include "../../cpudetect.h"
+#include "osdep/mm_accel.h"
+#include "osdep/mangle.h"
+#include "osdep/cpudetect.h"
int (* a52_resample) (float * _f, int16_t * s16)=NULL;
int (* a52_resample32) (float * _f, float * s16)=NULL;
Modified: mplayerxp/libmpcodecs/libdca/downmix.c
===================================================================
--- mplayerxp/libmpcodecs/libdca/downmix.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/libdca/downmix.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -22,12 +22,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "../../mp_config.h"
+#include "mp_config.h"
#include <string.h>
#include <inttypes.h>
-#include "../../cpudetect.h"
+#include "osdep/cpudetect.h"
#include "dca.h"
#include "dca_internal.h"
@@ -344,7 +344,7 @@
return -1; /* NOTREACHED */
}
-#include "../../mm_accel.h"
+#include "osdep/mm_accel.h"
#undef HAVE_MMX
#undef HAVE_MMX2
Deleted: mplayerxp/libmpcodecs/libdca/mangle.h
===================================================================
--- mplayerxp/libmpcodecs/libdca/mangle.h 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/libdca/mangle.h 2012-10-29 11:38:55 UTC (rev 244)
@@ -1,2 +0,0 @@
-#include "../mangle.h"
-
Modified: mplayerxp/libmpcodecs/libdca/resample.c
===================================================================
--- mplayerxp/libmpcodecs/libdca/resample.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/libdca/resample.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -8,10 +8,10 @@
#include <stdio.h>
#include "dca.h"
#include "dca_internal.h"
-#include "../../mp_config.h"
-#include "../../mm_accel.h"
-#include "../../mangle.h"
-#include "../../cpudetect.h"
+#include "mp_config.h"
+#include "osdep/mm_accel.h"
+#include "osdep/mangle.h"
+#include "osdep/cpudetect.h"
int (* dca_resample) (float * _f, int16_t * s16)=NULL;
int (* dca_resample32) (float * _f, float * s16)=NULL;
Modified: mplayerxp/libmpcodecs/libnuppelvideo/minilzo.c
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/minilzo.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/libnuppelvideo/minilzo.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -56,7 +56,7 @@
#endif
#include <stdio.h>
-#include "cpudetect.h"
+#include "osdep/cpudetect.h"
#ifndef __LZO_CONF_H
#define __LZO_CONF_H
Modified: mplayerxp/libmpcodecs/vd_ffmpeg.c
===================================================================
--- mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/vd_ffmpeg.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -13,13 +13,13 @@
#include "help_mp.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "vd_internal.h"
#include "codecs_ld.h"
-#include "../postproc/postprocess.h"
-#include "../postproc/vf.h"
-#include "../libvo/video_out.h"
+#include "postproc/postprocess.h"
+#include "postproc/vf.h"
+#include "libvo/video_out.h"
static const vd_info_t info = {
"FFmpeg's libavcodec codec family",
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.c
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -11,11 +11,11 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "mp_config.h"
-#include "../mplayer.h"
+#include "mplayer.h"
#include "vd_internal.h"
-#include "../cpudetect.h"
-#include "../mm_accel.h"
-#include "../postproc/postprocess.h"
+#include "osdep/cpudetect.h"
+#include "osdep/mm_accel.h"
+#include "postproc/postprocess.h"
#include "codecs_ld.h"
static const vd_info_t info =
Modified: mplayerxp/libmpcodecs/vd_qtvideo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/vd_qtvideo.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include "mp_config.h"
-#include "../mplayer.h"
+#include "mplayer.h"
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
@@ -28,7 +28,7 @@
LIBVD_EXTERN(qtvideo)
-#include "../bswap.h"
+#include "osdep/bswap.h"
#ifdef MACOSX
#include <QuickTime/ImageCodec.h>
Modified: mplayerxp/libmpcodecs/vd_xanim.c
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpcodecs/vd_xanim.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -14,7 +14,7 @@
#include <stdarg.h> /* va_alist, va_start, va_end */
#include <errno.h> /* strerror, errno */
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "libmpconf/codec-cfg.h"
Modified: mplayerxp/libmpdemux/asf.h
===================================================================
--- mplayerxp/libmpdemux/asf.h 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/asf.h 2012-10-29 11:38:55 UTC (rev 244)
@@ -3,7 +3,7 @@
//#include "cp_config.h" /* for WORDS_BIGENDIAN */
#include <inttypes.h>
-#include "bswap.h"
+#include "osdep/bswap.h"
#ifndef MIN
#define MIN(a,b) ((a<b)?a:b)
Modified: mplayerxp/libmpdemux/aviheader.h
===================================================================
--- mplayerxp/libmpdemux/aviheader.h 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/aviheader.h 2012-10-29 11:38:55 UTC (rev 244)
@@ -2,7 +2,7 @@
#define _aviheader_h
//#include "mp_config.h" /* get correct definition WORDS_BIGENDIAN */
-#include "bswap.h"
+#include "osdep/bswap.h"
/*
* Some macros to swap little endian structures read from an AVI file
Deleted: mplayerxp/libmpdemux/bswap.h
===================================================================
--- mplayerxp/libmpdemux/bswap.h 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/bswap.h 2012-10-29 11:38:55 UTC (rev 244)
@@ -1,2 +0,0 @@
-/* Let it be for now*/
-#include "../bswap.h"
Modified: mplayerxp/libmpdemux/cache2.c
===================================================================
--- mplayerxp/libmpdemux/cache2.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/cache2.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -1,4 +1,4 @@
-#include "../mp_config.h"
+#include "mp_config.h"
#define READ_USLEEP_TIME 10000
#define FILL_USLEEP_TIME 50000
@@ -14,14 +14,14 @@
#include <pthread.h>
#include "stream.h"
-#include "../sig_hand.h"
-#include "../osdep/timer.h"
-#include "../cpudetect.h"
-#include "bswap.h"
-#include "../libvo/fastmemcpy.h"
-#include "../help_mp.h"
+#include "sig_hand.h"
+#include "osdep/timer.h"
+#include "osdep/cpudetect.h"
+#include "osdep/bswap.h"
+#include "libvo/fastmemcpy.h"
+#include "help_mp.h"
#include "mpdemux.h"
-#include "../mplayer.h"
+#include "mplayer.h"
#include "demux_msg.h"
#ifndef min
Modified: mplayerxp/libmpdemux/demux_aiff.c
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_aiff.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -1,8 +1,8 @@
-#include "../mp_config.h"
+#include "mp_config.h"
#include <stdlib.h>
#include <stdio.h>
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "stream.h"
#include "demuxer.h"
Modified: mplayerxp/libmpdemux/demux_asf.c
===================================================================
--- mplayerxp/libmpdemux/demux_asf.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_asf.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -4,15 +4,15 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../mp_config.h"
+#include "mp_config.h"
#include "help_mp.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "stream.h"
#include "asf.h"
#include "demuxer.h"
#include "stheader.h"
-#include "../libmpcodecs/dec_audio.h"
+#include "libmpcodecs/dec_audio.h"
#include "aviprint.h"
#include "demux_msg.h"
/*
Modified: mplayerxp/libmpdemux/demux_audio.c
===================================================================
--- mplayerxp/libmpdemux/demux_audio.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_audio.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -1,4 +1,4 @@
-#include "../mp_config.h"
+#include "mp_config.h"
#include <stdlib.h>
#include <stdio.h>
@@ -7,9 +7,9 @@
#include "stheader.h"
#include "genres.h"
#include <limits.h>
-#include "../libmpcodecs/dec_audio.h"
+#include "libmpcodecs/dec_audio.h"
#include "aviprint.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "mp3_hdr.h"
#include <string.h>
#ifdef MP_DEBUG
Modified: mplayerxp/libmpdemux/demux_avi.c
===================================================================
--- mplayerxp/libmpdemux/demux_avi.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_avi.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -4,14 +4,14 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../mp_config.h"
+#include "mp_config.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "aviheader.h"
#include "libmpcodecs/dec_audio.h"
#include "libmpconf/cfgparser.h"
Modified: mplayerxp/libmpdemux/demux_film.c
===================================================================
--- mplayerxp/libmpdemux/demux_film.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_film.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -16,10 +16,10 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../mp_config.h"
+#include "mp_config.h"
#include "help_mp.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_mkv.c
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_mkv.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -22,7 +22,7 @@
#include "help_mp.h"
#include <dlfcn.h>
-#include "../bswap.h"
+#include "osdep/bswap.h"
#include "libmpsub/vobsub.h"
#include "libmpsub/subreader.h"
#include "libvo/sub.h"
Modified: mplayerxp/libmpdemux/demux_mov.c
===================================================================
--- mplayerxp/libmpdemux/demux_mov.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_mov.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -21,14 +21,14 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../mp_config.h"
+#include "mp_config.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "qtpalette.h"
#include "parse_mp4.h" // .MP4 specific stuff
Modified: mplayerxp/libmpdemux/demux_mpg.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_mpg.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -10,8 +10,8 @@
#include <stdlib.h>
#include <unistd.h>
-#include "bswap.h"
-#include "../mp_config.h"
+#include "osdep/bswap.h"
+#include "mp_config.h"
#include "help_mp.h"
#include "stream.h"
Modified: mplayerxp/libmpdemux/demux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_mpxp64.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -8,7 +8,7 @@
#define __USE_ISOC99 1 /* for lrint */
#include <math.h>
-#include "../mp_config.h"
+#include "mp_config.h"
#include "help_mp.h"
#include "stream.h"
@@ -18,7 +18,7 @@
#include "nls/nls.h"
#include "libmpsub/subreader.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "aviheader.h"
#include "libmpcodecs/dec_audio.h"
#include "libvo/sub.h"
Modified: mplayerxp/libmpdemux/demux_ogg.c
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_ogg.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -12,16 +12,16 @@
#include <theora/theora.h>
#endif
-#include "../mplayer.h"
-#include "bswap.h"
+#include "mplayer.h"
+#include "osdep/bswap.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "aviprint.h"
-#include "../libmpcodecs/codecs_ld.h"
-#include "../libmpcodecs/dec_audio.h"
-#include "../libvo/video_out.h"
+#include "libmpcodecs/codecs_ld.h"
+#include "libmpcodecs/dec_audio.h"
+#include "libvo/video_out.h"
#include "demux_msg.h"
#define BLOCK_SIZE 4096
Modified: mplayerxp/libmpdemux/demux_pva.c
===================================================================
--- mplayerxp/libmpdemux/demux_pva.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_pva.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -26,14 +26,14 @@
#include <stdlib.h>
#include <string.h>
-#include "../mp_config.h"
+#include "mp_config.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "demux_msg.h"
/*
@@ -42,7 +42,7 @@
#define PVA_MAX_VIDEO_PACK_LEN 6*1024
-#define VIDEOSTREAM 0x01
+#define VIDEOSTREAM 0x01
#define MAINAUDIOSTREAM 0x02
typedef struct {
Modified: mplayerxp/libmpdemux/demux_ra.c
===================================================================
--- mplayerxp/libmpdemux/demux_ra.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_ra.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -8,13 +8,13 @@
#include <limits.h>
#include <unistd.h>
-#include "../mp_config.h"
+#include "mp_config.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "aviprint.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/demux_real.c
===================================================================
--- mplayerxp/libmpdemux/demux_real.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_real.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -23,15 +23,15 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../mp_config.h"
+#include "mp_config.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "aviprint.h"
-#include "../libmpcodecs/dec_audio.h"
+#include "libmpcodecs/dec_audio.h"
#include "demux_msg.h"
#define MKTAG(a, b, c, d) (a | (b << 8) | (c << 16) | (d << 24))
Modified: mplayerxp/libmpdemux/demux_smjpeg.c
===================================================================
--- mplayerxp/libmpdemux/demux_smjpeg.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_smjpeg.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -16,13 +16,13 @@
#include <unistd.h>
#include <string.h> /* strtok */
-#include "../mp_config.h"
+#include "mp_config.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "demux_msg.h"
static int smjpeg_probe(demuxer_t* demuxer){
Modified: mplayerxp/libmpdemux/demux_ts.c
===================================================================
--- mplayerxp/libmpdemux/demux_ts.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_ts.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -27,16 +27,16 @@
#include <stdlib.h>
#include <string.h>
-#include "../mp_config.h"
-#include "../mplayer.h"
+#include "mp_config.h"
+#include "mplayer.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "parse_es.h"
#include "stheader.h"
-#include "../libmpcodecs/dec_audio.h"
+#include "libmpcodecs/dec_audio.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "mpeg_hdr.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/demux_ty.c
===================================================================
--- mplayerxp/libmpdemux/demux_ty.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_ty.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -35,8 +35,8 @@
#include <time.h>
#include <stdarg.h>
-#include "../mp_config.h"
-#include "bswap.h"
+#include "mp_config.h"
+#include "osdep/bswap.h"
#include "help_mp.h"
#include "stream.h"
Modified: mplayerxp/libmpdemux/demux_viv.c
===================================================================
--- mplayerxp/libmpdemux/demux_viv.c 2012-10-29 11:01:14 UTC (rev 243)
+++ mplayerxp/libmpdemux/demux_viv.c 2012-10-29 11:38:55 UTC (rev 244)
@@ -10,13 +10,13 @@
#include <unistd.h>
#include <string.h> /* strtok */
-#include "../mp_config.h"
+#include "mp_config.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
-#include "bswap.h"
+#include "osdep/bswap.h"
#include "demux_msg.h"
#include "libmpconf/cfgpa...
[truncated message content] |
