virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

sierravmd: fix Indeo3 videos

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Matthew Hoops
2011-03-31 10:42:22 -04:00
committed by Anton Khirnov
parent 41327cca61
commit 0e635f3e86
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/sierravmd.c
View File

@@ -99,7 +99,7 @@ static int vmd_read_header(AVFormatContext *s,
if (avio_read(pb, vmd->vmd_header, VMD_HEADER_SIZE) != VMD_HEADER_SIZE) if (avio_read(pb, vmd->vmd_header, VMD_HEADER_SIZE) != VMD_HEADER_SIZE)
return AVERROR(EIO); return AVERROR(EIO);
if(vmd->vmd_header[16] == 'i' && vmd->vmd_header[17] == 'v' && vmd->vmd_header[18] == '3') if(vmd->vmd_header[24] == 'i' && vmd->vmd_header[25] == 'v' && vmd->vmd_header[26] == '3')
vmd->is_indeo3 = 1; vmd->is_indeo3 = 1;
else else
vmd->is_indeo3 = 0; vmd->is_indeo3 = 0;
@@ -249,7 +249,7 @@ static int vmd_read_packet(AVFormatContext *s,
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
pkt->pos= avio_tell(pb); pkt->pos= avio_tell(pb);
memcpy(pkt->data, frame->frame_record, BYTES_PER_FRAME_RECORD); memcpy(pkt->data, frame->frame_record, BYTES_PER_FRAME_RECORD);
if(vmd->is_indeo3) if(vmd->is_indeo3 && frame->frame_record[0] == 0x02)
ret = avio_read(pb, pkt->data, frame->frame_size); ret = avio_read(pb, pkt->data, frame->frame_size);
else else
ret = avio_read(pb, pkt->data + BYTES_PER_FRAME_RECORD, ret = avio_read(pb, pkt->data + BYTES_PER_FRAME_RECORD,