diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2003-05-29 16:51:30 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2003-05-29 16:51:30 +0000 |
| commit | 3bd94361cefad16ce1a6c72a80f97b9a5bbc8209 (patch) | |
| tree | ff9ec5d37c3b1fa055989a6d4ef5505295a164a2 /src | |
| parent | bc5fa90168458712cc2c7a47216ebe6351e01cc0 (diff) | |
| download | xine-lib-3bd94361cefad16ce1a6c72a80f97b9a5bbc8209.tar.gz xine-lib-3bd94361cefad16ce1a6c72a80f97b9a5bbc8209.tar.bz2 | |
store fourcc from stream header as integer as it's never used as a string
CVS patchset: 4984
CVS date: 2003/05/29 16:51:30
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_avi.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 0cf9d1185..e866ec2aa 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.156 2003/05/29 16:22:09 jstembridge Exp $ + * $Id: demux_avi.c,v 1.157 2003/05/29 16:51:30 jstembridge Exp $ * * demultiplexer for avi streams * @@ -144,7 +144,7 @@ typedef struct long dwScale, dwRate; double fps; /* Frames per second */ - char compressor[8]; /* Type of compressor, 4 bytes + padding for 0 byte */ + uint32_t compressor; /* Type of compressor */ long video_strn; /* Video stream number */ char video_tag[4]; /* Tag of video data */ long video_posf; /* Number of next frame to be read @@ -701,8 +701,7 @@ static avi_t *AVI_init(demux_avi_t *this) { i += 8; if(strncasecmp(hdrl_data+i,"vids",4) == 0 && !vids_strh_seen) { - memcpy(AVI->compressor,hdrl_data+i+4,4); - AVI->compressor[4] = 0; + AVI->compressor = *(uint32_t *) hdrl_data+i+4; AVI->dwScale = str2ulong(hdrl_data+i+20); AVI->dwRate = str2ulong(hdrl_data+i+24); @@ -1426,12 +1425,11 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { this->avi->video_type = fourcc_to_buf_video(this->avi->bih->biCompression); if (this->avi->video_type) { - memcpy(this->avi->compressor, &this->avi->bih->biCompression, 4); - this->avi->compressor[4] = 0; + this->avi->compressor = this->avi->bih->biCompression; } else - this->avi->video_type = fourcc_to_buf_video(*(uint32_t *)this->avi->compressor); + this->avi->video_type = fourcc_to_buf_video(this->avi->compressor); - this->stream->stream_info[XINE_STREAM_INFO_VIDEO_FOURCC] = *(uint32_t *) this->avi->compressor; + this->stream->stream_info[XINE_STREAM_INFO_VIDEO_FOURCC] = this->avi->compressor; if (!this->avi->video_type) { |