[FFmpeg-cvslog] r18418 - trunk/libavcodec/h264.c

reimar subversion
Fri Apr 10 16:30:04 CEST 2009


Author: reimar
Date: Fri Apr 10 16:30:04 2009
New Revision: 18418

Log:
Loop up to MAX_THREADS instead of h->s.avctx->thread_count to free the thread
contexts, this avoids a crash when freeing the H.264 parser context introduced in
r18406, since h->s.avctx is NULL there.

Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Fri Apr 10 14:53:22 2009	(r18417)
+++ trunk/libavcodec/h264.c	Fri Apr 10 16:30:04 2009	(r18418)
@@ -1989,7 +1989,7 @@ static void free_tables(H264Context *h){
     av_freep(&h->mb2b_xy);
     av_freep(&h->mb2b8_xy);
 
-    for(i = 0; i < h->s.avctx->thread_count; i++) {
+    for(i = 0; i < MAX_THREADS; i++) {
         hx = h->thread_context[i];
         if(!hx) continue;
         av_freep(&hx->top_borders[1]);



More information about the ffmpeg-cvslog mailing list