vod: remove pf_media_{add,del}_es

These are never used

diff --git a/include/vlc_vod.h b/include/vlc_vod.h
index 9b136108f2b844a971087a407f249ed3f5c5cf9b..6473516153d57ec1614b145e29e314b622d8311e 100644 (file)
--- a/include/vlc_vod.h
+++ b/include/vlc_vod.h
@@ -46,8 +46,6 @@ struct vod_t
 
     vod_media_t * (*pf_media_new)   ( vod_t *, const char *, input_item_t * );
     void          (*pf_media_del)   ( vod_t *, vod_media_t * );
-    int           (*pf_media_add_es)( vod_t *, vod_media_t *, es_format_t * );
-    void          (*pf_media_del_es)( vod_t *, vod_media_t *, es_format_t * );
 
     /* Owner properties */
     int (*pf_media_control) ( void *, vod_media_t *, const char *, int, va_list );

diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index f2f4d1b638a7d6347314c3d36fc3adbbe41ea6ef..0d2a90269953f1c3fbf16755922e50892dc2d550 100644 (file)
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -297,8 +297,6 @@ static int Open( vlc_object_t *p_this )
 
     p_vod->pf_media_new = MediaNew;
     p_vod->pf_media_del = MediaAskDel;
-    p_vod->pf_media_add_es = MediaAddES;
-    p_vod->pf_media_del_es = MediaDelES;
 
     p_sys->p_fifo_cmd = block_FifoNew();
     if( vlc_thread_create( p_vod, "rtsp vod thread", CommandThread,

diff --git a/modules/stream_out/vod.c b/modules/stream_out/vod.c
index 5efce26a6ae66f7a8e83bd65016e460a6aea7123..14175c55065af5beae6482515078998777149620 100644 (file)
--- a/modules/stream_out/vod.c
+++ b/modules/stream_out/vod.c
@@ -162,9 +162,6 @@ int OpenVoD( vlc_object_t *p_this )
 
     p_vod->pf_media_new = MediaNew;
     p_vod->pf_media_del = MediaAskDel;
-    /* These are never used in the core, wonder why they're in the API */
-    p_vod->pf_media_add_es = NULL;
-    p_vod->pf_media_del_es = NULL;
 
     p_sys->p_fifo_cmd = block_FifoNew();
     if( vlc_thread_create( p_vod, "rtsp vod thread", CommandThread,