From: James S. <jst...@us...> - 2003-05-29 16:22:13
|
Update of /cvsroot/xine/xine-lib/src/demuxers In directory sc8-pr-cvs1:/tmp/cvs-serv2530 Modified Files: demux_avi.c Log Message: stream header fourcc is optional so read fourcc for stream info from bitmap info Index: demux_avi.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/demuxers/demux_avi.c,v retrieving revision 1.155 retrieving revision 1.156 diff -u -r1.155 -r1.156 --- demux_avi.c 26 Apr 2003 20:15:56 -0000 1.155 +++ demux_avi.c 29 May 2003 16:22:09 -0000 1.156 @@ -1424,10 +1424,14 @@ buf->size = this->avi->bih->biSize; this->avi->video_type = fourcc_to_buf_video(this->avi->bih->biCompression); - this->stream->stream_info[XINE_STREAM_INFO_VIDEO_FOURCC] = *(uint32_t *)this->avi->compressor; - - if (!this->avi->video_type) + + if (this->avi->video_type) { + memcpy(this->avi->compressor, &this->avi->bih->biCompression, 4); + this->avi->compressor[4] = 0; + } else this->avi->video_type = fourcc_to_buf_video(*(uint32_t *)this->avi->compressor); + + this->stream->stream_info[XINE_STREAM_INFO_VIDEO_FOURCC] = *(uint32_t *) this->avi->compressor; if (!this->avi->video_type) { |