image: remove dead code

diff --git a/include/vlc_image.h b/include/vlc_image.h
index 52bce1f24495ffdbadfb6d0aef0953577992b9a2..fc8b2a971150385c98196dbdb48507283b585e71 100644 (file)
--- a/include/vlc_image.h
+++ b/include/vlc_image.h
@@ -49,8 +49,6 @@ struct image_handler_t
 
     picture_t * (*pf_convert)   ( image_handler_t *, picture_t *,
                                   video_format_t *, video_format_t * );
-    picture_t * (*pf_filter)    ( image_handler_t *, picture_t *,
-                                  video_format_t *, const char * );
 
     /* Private properties */
     vlc_object_t *p_parent;
@@ -68,7 +66,6 @@ VLC_API void image_HandlerDelete( image_handler_t * );
 #define image_Write( a, b, c, d ) a->pf_write( a, b, c, d )
 #define image_WriteUrl( a, b, c, d, e ) a->pf_write_url( a, b, c, d, e )
 #define image_Convert( a, b, c, d ) a->pf_convert( a, b, c, d )
-#define image_Filter( a, b, c, d ) a->pf_filter( a, b, c, d )
 
 VLC_API vlc_fourcc_t image_Type2Fourcc( const char *psz_name );
 VLC_API vlc_fourcc_t image_Ext2Fourcc( const char *psz_name );

diff --git a/src/misc/image.c b/src/misc/image.c
index 25fccc956b6e358c9802baee283981bac6b4044e..38f0e1a4ccc6d8f0ba78126954470ad3b26c0e42 100644 (file)
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -59,8 +59,6 @@ static int ImageWriteUrl( image_handler_t *, picture_t *,
 
 static picture_t *ImageConvert( image_handler_t *, picture_t *,
                                 video_format_t *, video_format_t * );
-static picture_t *ImageFilter( image_handler_t *, picture_t *,
-                               video_format_t *, const char *psz_module );
 
 static decoder_t *CreateDecoder( vlc_object_t *, video_format_t * );
 static void DeleteDecoder( decoder_t * );
@@ -93,7 +91,6 @@ image_handler_t *image_HandlerCreate( vlc_object_t *p_this )
     p_image->pf_write = ImageWrite;
     p_image->pf_write_url = ImageWriteUrl;
     p_image->pf_convert = ImageConvert;
-    p_image->pf_filter = ImageFilter;
 
     return p_image;
 }
@@ -492,41 +489,6 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic,
     return p_pif;
 }
 
-/**
- * Filter an image with a psz_module filter
- *
- */
-
-static picture_t *ImageFilter( image_handler_t *p_image, picture_t *p_pic,
-                               video_format_t *p_fmt, const char *psz_module )
-{
-    /* Start a filter */
-    if( !p_image->p_filter )
-    {
-        es_format_t fmt;
-        es_format_Init( &fmt, VIDEO_ES, p_fmt->i_chroma );
-        fmt.video = *p_fmt;
-
-        p_image->p_filter =
-            CreateFilter( p_image->p_parent, &fmt, &fmt.video, psz_module );
-
-        if( !p_image->p_filter )
-        {
-            return NULL;
-        }
-    }
-    else
-    {
-        /* Filters should handle on-the-fly size changes */
-        p_image->p_filter->fmt_in.video = *p_fmt;
-        p_image->p_filter->fmt_out.video = *p_fmt;
-    }
-
-    picture_Hold( p_pic );
-
-    return p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic );
-}
-
 /**
  * Misc functions
  *