[MPlayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,1.151,1.152

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv23719

Modified Files:
	vd_ffmpeg.c 
Log Message:
do not set ctx->vo_inited when init fails. This caused a crash when a
matching colorspace is missing in codecs.conf.


Index: vd_ffmpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_ffmpeg.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- vd_ffmpeg.c	16 Sep 2005 11:30:33 -0000	1.151
+++ vd_ffmpeg.c	10 Nov 2005 20:36:37 -0000	1.152
@@ -533,7 +533,6 @@
 	    sh->aspect = ctx->last_aspect;
 	sh->disp_w = width;
 	sh->disp_h = height;
-	ctx->vo_inited=1;
 	switch(pix_fmt){
 	// YUVJ are YUV formats that use the full Y range and not just
 	// 16 - 235 (see colorspaces.txt).
@@ -562,6 +561,7 @@
 	}
     	if (!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h, ctx->best_csp))
     		return -1;
+	ctx->vo_inited = 1;
     }
     return 0;
 }