diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-31 04:52:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-31 04:52:15 +0200 |
| commit | ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3 (patch) | |
| tree | a5f3a6d636e96f05bb52f0b2407107a7f0c8b443 /libmpdemux | |
| parent | 03aa64687fc109c5f2346a3c191b70698b333509 (diff) | |
| parent | 0e77da241da8b911c96a0e22898e84d7f7b74678 (diff) | |
| download | mpv-ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3.tar.bz2 mpv-ccf4d9e96cd7aa8506e6632d2a7352ec89b2b9e3.tar.xz | |
Merge svn changes up to r28403
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_xmms.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demuxer.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libmpdemux/demux_xmms.c b/libmpdemux/demux_xmms.c index b7b2e72d66..9263621a0b 100644 --- a/libmpdemux/demux_xmms.c +++ b/libmpdemux/demux_xmms.c @@ -101,7 +101,7 @@ static int disk_open(AFormat fmt, int rate, int nch) { xmms_afmt=AF_FORMAT_U16_LE; break; case FMT_U16_NE: -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN xmms_afmt=AF_FORMAT_U16_BE; #else xmms_afmt=AF_FORMAT_U16_LE; diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index e8b62a1004..f7f69a9fb7 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -151,7 +151,7 @@ typedef struct demuxer_info { #define MAX_A_STREAMS 256 #define MAX_V_STREAMS 256 -#define MAX_S_STREAMS 32 +#define MAX_S_STREAMS 256 struct demuxer; @@ -364,7 +364,7 @@ stream_t* new_ds_stream(demux_stream_t *ds); static inline int avi_stream_id(unsigned int id){ unsigned char *p=(unsigned char *)&id; unsigned char a,b; -#if WORDS_BIGENDIAN +#ifdef WORDS_BIGENDIAN a=p[3]-'0'; b=p[2]-'0'; #else a=p[0]-'0'; b=p[1]-'0'; |