When resetting vst->pkt.data to NULL, also set vst->slices.

This avoids a crash when the next slice is not a start slice and thus
pkt->data is still NULL.
This probably only happens with broken or unsupported files like
http://samples.mplayerhq.hu/real/multirate/JustaSpa1937_64kb.rm
that need further fixes, but keeping vst state consistent is still a good idea.

Originally committed as revision 19830 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Reimar Döffinger 16 years ago
parent dbe0ad85c1
commit cbb5da57cd
  1. 1
      libavformat/rmdec.c

@ -637,6 +637,7 @@ static int rm_assemble_video_frame(AVFormatContext *s, ByteIOContext *pb,
pkt->size = vst->videobufpos + 8*(vst->cur_slice - vst->slices); pkt->size = vst->videobufpos + 8*(vst->cur_slice - vst->slices);
pkt->pts = AV_NOPTS_VALUE; pkt->pts = AV_NOPTS_VALUE;
pkt->pos = vst->pktpos; pkt->pos = vst->pktpos;
vst->slices = 0;
return 0; return 0;
} }

Loading…
Cancel
Save