diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-06-03 16:20:35 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-06-03 16:20:35 +0000 |
| commit | 07edb89ff5d2484e0549992dc9d3e4ea7727dc89 (patch) | |
| tree | 4c40cfe6079fd0874e48893f896b951505bb7f9e /src/demuxers | |
| parent | 4849b574232233c801f244406b7cd16a0e52add3 (diff) | |
| download | xine-lib-07edb89ff5d2484e0549992dc9d3e4ea7727dc89.tar.gz xine-lib-07edb89ff5d2484e0549992dc9d3e4ea7727dc89.tar.bz2 | |
provide function to convert endianess of BITMAPINFOHEADER (when reading data from
win32/MS format files)
CVS patchset: 1998
CVS date: 2002/06/03 16:20:35
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_asf.c | 3 | ||||
| -rw-r--r-- | src/demuxers/demux_avi.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index ca28d2037..2625eb02b 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_asf.c,v 1.41 2002/06/03 13:31:13 miguelfreitas Exp $ + * $Id: demux_asf.c,v 1.42 2002/06/03 16:20:35 miguelfreitas Exp $ * * demultiplexer for asf streams * @@ -529,6 +529,7 @@ static int asf_read_header (demux_asf_t *this) { this->bih_size = get_le16(this); /* size */ this->input->read (this->input, (uint8_t *) this->bih, this->bih_size); + xine_bmiheader_le2me( (xine_bmiheader *) this->bih ); asf_send_video_header (this, stream_id); #ifdef LOG diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index a217e84f2..68c45da3c 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_avi.c,v 1.91 2002/06/03 13:31:13 miguelfreitas Exp $ + * $Id: demux_avi.c,v 1.92 2002/06/03 16:20:36 miguelfreitas Exp $ * * demultiplexer for avi streams * @@ -729,9 +729,11 @@ static avi_t *AVI_init(demux_avi_t *this) { if(lasttag == 1) { /* printf ("size : %d\n",sizeof(AVI->bih)); */ memcpy (&AVI->bih, hdrl_data+i, sizeof(AVI->bih)); + xine_bmiheader_le2me( &AVI->bih ); + /* stream_read(demuxer->stream,(char*) &avi_header.bih,MIN(size2,sizeof(avi_header.bih))); */ - AVI->width = str2ulong(hdrl_data+i+4); - AVI->height = str2ulong(hdrl_data+i+8); + AVI->width = AVI->bih.biWidth; + AVI->height = AVI->bih.biHeight; /* printf ("size : %d x %d (%d x %d)\n", AVI->width, AVI->height, AVI->bih.biWidth, AVI->bih.biHeight); |