[vlc-commits] commit: libass/win32: Factorize (Jean-Baptiste Kempf )

git at videolan.org git at videolan.org
Tue Apr 27 00:56:50 CEST 2010


vlc/vlc-1.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Apr 27 00:50:52 2010 +0200| [5df1e4344f5e5ed3d3513919f9fa64ec0843d4b2] | committer: Jean-Baptiste Kempf 

libass/win32: Factorize
(cherry picked from commit d8e03df80c812d7389753ae7aaa601e8d8f18d3a)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=5df1e4344f5e5ed3d3513919f9fa64ec0843d4b2
---

 modules/codec/libass.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index dbd5fde..afa1a64 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -732,7 +732,11 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
 #endif
 #ifdef WIN32
     if( p_dialog )
+    {
         dialog_ProgressSet( p_dialog, NULL, 1.0 );
+        dialog_ProgressDestroy( p_dialog );
+        p_dialog = NULL;
+    }
 #endif
 #else
     /* FIXME you HAVE to give him a font if no fontconfig */
@@ -750,10 +754,6 @@ static ass_handle_t *AssHandleHold( decoder_t *p_dec )
 
     /* */
     vlc_mutex_unlock( &libass_lock );
-#ifdef WIN32
-    if( p_dialog )
-        dialog_ProgressDestroy( p_dialog );
-#endif
     return p_ass;
 
 error:



More information about the vlc-commits mailing list