]> granicus.if.org Git - libass/commitdiff
Simplify vf_ass initialization.
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Thu, 24 Aug 2006 15:36:20 +0000 (15:36 +0000)
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>
Thu, 24 Aug 2006 15:36:20 +0000 (15:36 +0000)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19523 b3059339-0415-0410-9bf9-f77b7e298cf2

libass/ass_render.c

index 327f886b19c12c67e6fec5a793d6530733ac7737..8f961e61a8e96a44e2d4b2c8501fc55fd5fca69f 100644 (file)
@@ -178,20 +178,20 @@ ass_instance_t* ass_init(void)
        if (family) free(family);
 
        if (!fc_priv)
-               return 0;
+               goto ass_init_exit;
        
        error = FT_Init_FreeType( &ft );
        if ( error ) { 
                mp_msg(MSGT_GLOBAL, MSGL_FATAL, "FT_Init_FreeType failed\n");
                fontconfig_done(fc_priv);
-               return 0;
+               goto ass_init_exit;
        }
 
        priv = calloc(1, sizeof(ass_instance_t));
        if (!priv) {
                FT_Done_FreeType(ft);
                fontconfig_done(fc_priv);
-               return 0;
+               goto ass_init_exit;
        }
        priv->library = ft;
        priv->fontconfig_priv = fc_priv;
@@ -202,6 +202,10 @@ ass_instance_t* ass_init(void)
 
        text_info.glyphs = calloc(MAX_GLYPHS, sizeof(glyph_info_t));
        
+ass_init_exit:
+       if (priv) mp_msg(MSGT_GLOBAL, MSGL_INFO, "[ass] Init\n");
+       else mp_msg(MSGT_GLOBAL, MSGL_ERR, "[ass] Init failed\n");
+
        return priv;
 }