Enabled again timeout for win32 in live555.

[vlc] / modules / codec / realvideo.c

diff --git a/modules/codec/realvideo.c b/modules/codec/realvideo.c
index 04d7e8467632cbb1c13a49b30d9d7e069ec6550f..23ea612ae5a69dce12374f53977dc491ae9e5e53 100644 (file)
--- a/modules/codec/realvideo.c
+++ b/modules/codec/realvideo.c
@@ -128,13 +128,13 @@ static void Close( vlc_object_t * );
 //static int  OpenPacketizer( vlc_object_t * );
 static picture_t *DecodeVideo( decoder_t *, block_t ** );
 
-vlc_module_begin();
-    set_description( N_("RealVideo library decoder") );
-    set_capability( "decoder", 10 );
-    set_category( CAT_INPUT );
-    set_subcategory( SUBCAT_INPUT_VCODEC );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("RealVideo library decoder") )
+    set_capability( "decoder", 10 )
+    set_category( CAT_INPUT )
+    set_subcategory( SUBCAT_INPUT_VCODEC )
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 
 /*****************************************************************************
@@ -146,15 +146,15 @@ static void * load_syms(decoder_t *p_dec, const char *path)
 {
     void *handle;
 
-    msg_Dbg( p_dec, "opening win32 dll '%s'\n", path);
+    msg_Dbg( p_dec, "opening win32 dll '%s'", path);
 #ifdef LOADER
     Setup_LDT_Keeper();
 #endif
     handle = LoadLibraryA(path);
-    msg_Dbg( p_dec, "win32 real codec handle=%p  \n",handle);
+    msg_Dbg( p_dec, "win32 real codec handle=%p",handle);
     if (!handle)
     {
-        msg_Err( p_dec, "Error loading dll\n");
+        msg_Err( p_dec, "Error loading dll");
         return NULL;
     }
 
@@ -168,7 +168,7 @@ static void * load_syms(decoder_t *p_dec, const char *path)
         dll_type = 1;
         return handle;
     }
-    msg_Err( p_dec, "Error resolving symbols! (version incompatibility?)\n");
+    msg_Err( p_dec, "Error resolving symbols! (version incompatibility?)");
     FreeLibrary(handle);
     return NULL; // error
 }
@@ -177,12 +177,12 @@ static void * load_syms_linux(decoder_t *p_dec, const char *path)
 {
     void *handle;
 
-    msg_Dbg( p_dec, "opening shared obj '%s'\n", path);
+    msg_Dbg( p_dec, "opening shared obj '%s'", path);
 
     handle = dlopen (path, RTLD_LAZY);
     if (!handle) 
     {
-        msg_Err( p_dec,"Error: %s\n",dlerror());
+        msg_Err( p_dec,"Error: %s",dlerror());
         return NULL;
     }
 
@@ -197,7 +197,7 @@ static void * load_syms_linux(decoder_t *p_dec, const char *path)
         return handle;
     }
 
-    msg_Err( p_dec,"Error resolving symbols! (version incompatibility?)\n");
+    msg_Err( p_dec,"Error resolving symbols! (version incompatibility?)");
     dlclose(handle);
     return 0;
 }
@@ -435,8 +435,7 @@ static void Close( vlc_object_t *p_this )
 
     vlc_mutex_unlock( &rm_mutex );
 
-    if ( p_sys )
-        free( p_sys );
+    free( p_sys );
 }
 
 /*****************************************************************************
@@ -514,7 +513,7 @@ static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
              || p_dec->fmt_in.video.i_height  != transform_out[4] )
             {
                 msg_Warn(p_dec, "Warning, Real's Header give a wrong "
-                         "information about media's width and height!\n"
+                         "information about media's width and height!"
                          "\tRealHeader: \t %d X %d  \t %d X %d",
                          p_dec->fmt_in.video.i_width,
                          p_dec->fmt_in.video.i_height,