]> git.sesse.net Git - vlc/commitdiff
Remove nestead assignement.
authorRémi Duraffort <ivoire@videolan.org>
Wed, 15 Jul 2009 16:35:34 +0000 (18:35 +0200)
committerRémi Duraffort <ivoire@videolan.org>
Wed, 15 Jul 2009 20:07:34 +0000 (22:07 +0200)
modules/access_output/http.c
modules/codec/png.c

index d2504310ec915f955342defd0cc7c3d8af8c6a6c..fde86a111f01eb82b522e80da93e87ea4f2094fa 100644 (file)
@@ -179,7 +179,7 @@ static int Open( vlc_object_t *p_this )
     config_ChainParse( p_access, SOUT_CFG_PREFIX, ppsz_sout_options, p_access->p_cfg );
 
     /* p_access->psz_path = "hostname:port/filename" */
-    psz_bind_addr = psz_parser = strdup( p_access->psz_path );
+    psz_bind_addr = strdup( p_access->psz_path );
 
     i_bind_port = 0;
 
index 3d8a6ff9fd075a5cf02ccff1196f7bc0c00b484d..61c9226c93176031e800d13e8a8c98fea829b958 100644 (file)
@@ -67,7 +67,6 @@ vlc_module_end ()
 static int OpenDecoder( vlc_object_t *p_this )
 {
     decoder_t *p_dec = (decoder_t*)p_this;
-    decoder_sys_t *p_sys;
 
     if( p_dec->fmt_in.i_codec != VLC_CODEC_PNG &&
         p_dec->fmt_in.i_codec != VLC_FOURCC('M','P','N','G') )
@@ -76,8 +75,7 @@ static int OpenDecoder( vlc_object_t *p_this )
     }
 
     /* Allocate the memory needed to store the decoder's structure */
-    if( ( p_dec->p_sys = p_sys =
-          (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
+    if( ( p_dec->p_sys = malloc(sizeof(decoder_sys_t)) ) == NULL )
         return VLC_ENOMEM;
 
     /* Set output properties */
@@ -150,7 +148,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         block_Release( p_block ); *pp_block = NULL;
         return NULL;
     }
+
     p_info = png_create_info_struct( p_png );
     if( p_info == NULL )
     {
@@ -166,7 +164,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
         block_Release( p_block ); *pp_block = NULL;
         return NULL;
     }
+
     /* libpng longjmp's there in case of error */
     if( setjmp( png_jmpbuf( p_png ) ) )
         goto error;