Fixed use of freed memory every time rtmp access is probed/used.

[vlc] / modules / video_filter / grain.c

diff --git a/modules/video_filter/grain.c b/modules/video_filter/grain.c
index 64654dee448b6dacf60d8225c58c9ffb10421b0c..dd07768e0dd6cecd50549ffb451e8069ce60cd5c 100644 (file)
--- a/modules/video_filter/grain.c
+++ b/modules/video_filter/grain.c
@@ -82,10 +82,7 @@ static int Create( vlc_object_t *p_this )
     /* Allocate structure */
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_filter->p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return VLC_ENOMEM;
-    }
 
     p_filter->pf_video_filter = Filter;
 
@@ -203,14 +200,5 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
     }
 
-    p_outpic->date = p_pic->date;
-    p_outpic->b_force = p_pic->b_force;
-    p_outpic->i_nb_fields = p_pic->i_nb_fields;
-    p_outpic->b_progressive = p_pic->b_progressive;
-    p_outpic->b_top_field_first = p_pic->b_top_field_first;
-
-    if( p_pic->pf_release )
-        p_pic->pf_release( p_pic );
-
-    return p_outpic;
+    return CopyInfoAndRelease( p_outpic, p_pic );
 }