[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec h264.c,1.165,1.166
Loren Merritt CVS
lorenm
Thu Nov 10 05:40:52 CET 2005
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv2171
Modified Files:
h264.c
Log Message:
fix a crash on seeking to an invalid frame
Index: h264.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h264.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- h264.c 9 Nov 2005 11:29:29 -0000 1.165
+++ h264.c 10 Nov 2005 04:40:49 -0000 1.166
@@ -7731,10 +7731,13 @@
h->delayed_output_pic = out;
#endif
- *pict= *(AVFrame*)out;
+ if(out)
+ *pict= *(AVFrame*)out;
+ else
+ av_log(avctx, AV_LOG_DEBUG, "no picture\n");
}
- assert(pict->data[0]);
+ assert(pict->data[0] || !*data_size);
ff_print_debug_info(s, pict);
//printf("out %d\n", (int)pict->data[0]);
#if 0 //?
More information about the ffmpeg-cvslog
mailing list