[vlc-commits] commit: vod: remove pf_media_{add, del}_es (Pierre Ynard )

git at videolan.org git at videolan.org
Wed Nov 17 17:00:00 CET 2010


vlc | branch: master | Pierre Ynard <linkfanel at yahoo.fr> | Wed Nov 17 16:59:01 2010 +0100| [d7cf24fe15d6ae18e28fce7efa04a385dcadf232] | committer: Pierre Ynard 

vod: remove pf_media_{add,del}_es

These are never used

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

 include/vlc_vod.h        |    2 --
 modules/misc/rtsp.c      |    2 --
 modules/stream_out/vod.c |    3 ---
 3 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/include/vlc_vod.h b/include/vlc_vod.h
index 9b13610..6473516 100644
--- 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 f2f4d1b..0d2a902 100644
--- 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 5efce26..14175c5 100644
--- 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,



More information about the vlc-commits mailing list