[FFmpeg-cvslog] r19830 - trunk/libavformat/rmdec.c

reimar subversion
Sun Sep 13 13:08:59 CEST 2009


Author: reimar
Date: Sun Sep 13 13:08:59 2009
New Revision: 19830

Log:
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.

Modified:
   trunk/libavformat/rmdec.c

Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c	Sun Sep 13 10:57:30 2009	(r19829)
+++ trunk/libavformat/rmdec.c	Sun Sep 13 13:08:59 2009	(r19830)
@@ -637,6 +637,7 @@ static int rm_assemble_video_frame(AVFor
         pkt->size = vst->videobufpos + 8*(vst->cur_slice - vst->slices);
         pkt->pts = AV_NOPTS_VALUE;
         pkt->pos = vst->pktpos;
+        vst->slices = 0;
         return 0;
     }
 



More information about the ffmpeg-cvslog mailing list