[vlc-commits] Swscale: init the pf_video_filter after possible fails

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Oct 26 01:16:25 2014 +0200| [aaef11b8631a47307051aaeae3001ee2639508d7] | committer: Jean-Baptiste Kempf

Swscale: init the pf_video_filter after possible fails

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

 modules/video_chroma/swscale.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c
index f432194..9e4c252 100644
--- a/modules/video_chroma/swscale.c
+++ b/modules/video_chroma/swscale.c
@@ -152,8 +152,6 @@ static int OpenScaler( vlc_object_t *p_this )
                        &p_filter->fmt_out.video, 0 ) )
         return VLC_EGENERIC;
 
-    /* */
-    p_filter->pf_video_filter = Filter;
     /* Allocate the memory needed to store the decoder's structure */
     if( ( p_filter->p_sys = p_sys = calloc(1, sizeof(filter_sys_t)) ) == NULL )
         return VLC_ENOMEM;
@@ -191,6 +189,9 @@ static int OpenScaler( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
+    /* */
+    p_filter->pf_video_filter = Filter;
+
     msg_Dbg( p_filter, "%ix%i (%ix%i) chroma: %4.4s -> %ix%i (%ix%i) chroma: %4.4s with scaling using %s",
              p_filter->fmt_in.video.i_visible_width, p_filter->fmt_in.video.i_visible_height,
              p_filter->fmt_in.video.i_width, p_filter->fmt_in.video.i_height,