[FFmpeg-cvslog] sierravmd: fix Indeo3 videos

Matthew Hoops git at videolan.org
Sat Apr 2 02:02:21 CEST 2011


ffmpeg | branch: master | Matthew Hoops <clone2727 at gmail.com> | Thu Mar 31 10:42:22 2011 -0400| [0e635f3e86956bd85896831f3c7e6dfaef97bf7d] | committer: Anton Khirnov

sierravmd: fix Indeo3 videos

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0e635f3e86956bd85896831f3c7e6dfaef97bf7d
---

 libavformat/sierravmd.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index c43d6ee..c0fb222 100644
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.c
@@ -99,7 +99,7 @@ static int vmd_read_header(AVFormatContext *s,
     if (avio_read(pb, vmd->vmd_header, VMD_HEADER_SIZE) != VMD_HEADER_SIZE)
         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;
     else
         vmd->is_indeo3 = 0;
@@ -249,7 +249,7 @@ static int vmd_read_packet(AVFormatContext *s,
         return AVERROR(ENOMEM);
     pkt->pos= avio_tell(pb);
     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);
     else
         ret = avio_read(pb, pkt->data + BYTES_PER_FRAME_RECORD,



More information about the ffmpeg-cvslog mailing list