[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.88,1.89

Michael Niedermayer CVS michael at mplayerhq.hu
Sat Apr 26 12:33:15 CEST 2003


Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv6183

Modified Files:
	vd_ffmpeg.c 
Log Message:
segfault fix


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- vd_ffmpeg.c	25 Apr 2003 00:57:04 -0000	1.88
+++ vd_ffmpeg.c	26 Apr 2003 10:32:45 -0000	1.89
@@ -394,7 +394,13 @@
                 | (ctx->do_slices ? MP_IMGFLAG_DRAW_CALLBACK : 0);
     }
 
-    if(init_vo(sh)<0 || ctx->b_count>1 || ctx->ip_count>2){
+    if(init_vo(sh)<0){
+        avctx->release_buffer= avcodec_default_release_buffer;
+        avctx->get_buffer= avcodec_default_get_buffer;
+        return avctx->get_buffer(avctx, pic);
+    }
+    
+    if(ctx->b_count>1 || ctx->ip_count>2){
         printf("DR1 failure\n");
 
         ctx->do_dr1=0; //FIXME



More information about the MPlayer-cvslog mailing list