diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-03 10:19:56 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-03-03 10:19:56 +0000 |
| commit | fd9fe9e04d56535ccbee56a7f0c5876009e56c9f (patch) | |
| tree | 925f95455381bb4098ee0c0a6ad4ab2b2716dd62 /libmpdemux | |
| parent | 3d4f1ec4833a4fcb9ce3894f033984174f788b8f (diff) | |
| download | mpv-fd9fe9e04d56535ccbee56a7f0c5876009e56c9f.tar.bz2 mpv-fd9fe9e04d56535ccbee56a7f0c5876009e56c9f.tar.xz | |
Make nuv files work on bigendian (but old nuv files created with mencoder
wont play anymore - before they would have worked with mplayer on be)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14897 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_nuv.c | 3 | ||||
| -rw-r--r-- | libmpdemux/nuppelvideo.h | 20 |
2 files changed, 23 insertions, 0 deletions
diff --git a/libmpdemux/demux_nuv.c b/libmpdemux/demux_nuv.c index eb12313494..7e3a6cc340 100644 --- a/libmpdemux/demux_nuv.c +++ b/libmpdemux/demux_nuv.c @@ -69,6 +69,7 @@ void demux_seek_nuv ( demuxer_t *demuxer, float rel_seek_secs, int flags ) { if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader)) return; /* EOF */ + le2me_rtframeheader(&rtjpeg_frameheader); if ( rtjpeg_frameheader.frametype == 'V' ) { @@ -145,6 +146,7 @@ int demux_nuv_fill_buffer ( demuxer_t *demuxer ) demuxer->filepos = orig_pos = stream_tell ( demuxer->stream ); if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader)) return 0; /* EOF */ + le2me_rtframeheader(&rtjpeg_frameheader); #if 0 printf("NUV frame: frametype: %c, comptype: %c, packetlength: %d\n", @@ -218,6 +220,7 @@ demuxer_t* demux_open_nuv ( demuxer_t* demuxer ) stream_seek(demuxer->stream, 0); stream_read ( demuxer->stream, (char*)& rtjpeg_fileheader, sizeof(rtjpeg_fileheader) ); + le2me_rtfileheader(&rtjpeg_fileheader); /* no video */ if (rtjpeg_fileheader.videoblocks == 0) diff --git a/libmpdemux/nuppelvideo.h b/libmpdemux/nuppelvideo.h index 2c6d217e9a..2e9dc51562 100644 --- a/libmpdemux/nuppelvideo.h +++ b/libmpdemux/nuppelvideo.h @@ -90,3 +90,23 @@ typedef struct audbuffertype unsigned char *buffer_offset; } audbuffertyp; +#ifdef WORDS_BIGENDIAN +#define le2me_rtfileheader(h) { \ + (h)->width = le2me_32((h)->width); \ + (h)->height = le2me_32((h)->height); \ + (h)->desiredwidth = le2me_32((h)->desiredwidth); \ + (h)->desiredheight = le2me_32((h)->desiredheight); \ + (h)->videoblocks = le2me_32((h)->videoblocks); \ + (h)->audioblocks = le2me_32((h)->audioblocks); \ + (h)->textsblocks = le2me_32((h)->textsblocks); \ + (h)->keyframedist = le2me_32((h)->keyframedist); \ + } +#define le2me_rtframeheader(h) { \ + (h)->timecode = le2me_32((h)->timecode); \ + (h)->packetlength = le2me_32((h)->packetlength); \ + } +#else +#define le2me_rtfileheader(h) /**/ +#define le2me_rtframeheader(h) /**/ +#endif + |