diff options
| author | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-01 03:02:25 +0000 |
|---|---|---|
| committer | melanson <melanson@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-01 03:02:25 +0000 |
| commit | c2a5adb55a80d090655a27ded0559e0710a1c8fd (patch) | |
| tree | 804c2796f45c0e436823ed9879317b0c2f2a8eeb /libmpdemux/demux_mov.c | |
| parent | ca3c4888c6d43dbca5a344b37b07f8bd50fbf365 (diff) | |
| download | mpv-c2a5adb55a80d090655a27ded0559e0710a1c8fd.tar.bz2 mpv-c2a5adb55a80d090655a27ded0559e0710a1c8fd.tar.xz | |
fixed some endian issues, like changing bswap_32() -> be2me_32(), and
removing FIXME #warning about endianness (seems to work fine on PPC)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4904 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mov.c')
| -rw-r--r-- | libmpdemux/demux_mov.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 0ecee54da1..49b1001382 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -194,12 +194,7 @@ typedef struct { mov_track_t* tracks[MOV_MAX_TRACKS]; } mov_priv_t; -#warning "FIXME - mov support is only working perfectly on Little Endian systems?!" -//#ifdef WORDS_BIGENDIAN -//#define MOV_FOURCC(a,b,c,d) ((d)|(c<<8)|(b<<16)|(a<<24)) -//#else #define MOV_FOURCC(a,b,c,d) ((a<<24)|(b<<16)|(c<<8)|(d)) -//#endif int mov_check_file(demuxer_t* demuxer){ int flags=0; @@ -250,7 +245,7 @@ int mov_check_file(demuxer_t* demuxer){ break; default: if(no==0) return 0; // first chunk is bad! - id = bswap_32(id); + id = be2me_32(id); mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",&id,(int)len); } if(!stream_skip(demuxer->stream,len-skipped)) break; @@ -531,7 +526,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak #warning "Implement atom 'code' for FLASH support" } default: - id = bswap_32(id); + id = be2me_32(id); mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",&id,(int)len); break; }//switch(id) @@ -740,7 +735,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak } case MOV_FOURCC('d','c','o','m'): { // int temp=stream_read_dword(demuxer->stream); - unsigned int len=bswap_32(stream_read_dword(demuxer->stream)); + unsigned int len=be2me_32(stream_read_dword(demuxer->stream)); mp_msg(MSGT_DEMUX, MSGL_INFO, "Compressed header uses %.4s algo!\n",&len); break; } @@ -911,7 +906,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak break; } /* eof udta */ default: - id = bswap_32(id); + id = be2me_32(id); mp_msg(MSGT_DEMUX,MSGL_V,"MOV: unknown chunk: %.4s %d\n",&id,(int)len); } /* endof switch */ } /* endof else */ |