vlc | branch: master | Edward Wang <edward.c.w...@compdigitec.com> | Sun Oct 27 00:39:23 2013 -0400| [39faaf585438cadc374ae96b15d88472742f673a] | committer: Rémi Denis-Courmont
directory: add support for ACCESS_GET_CONTENT_TYPE Remove the psz_demux hack. Ref #8449 Signed-off-by: Rémi Denis-Courmont <r...@remlab.net> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=39faaf585438cadc374ae96b15d88472742f673a --- modules/access/directory.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/access/directory.c b/modules/access/directory.c index 0159042..c18bc5b 100644 --- a/modules/access/directory.c +++ b/modules/access/directory.c @@ -198,10 +198,7 @@ int DirInit (access_t *p_access, DIR *handle) p_access->pf_read = NULL; p_access->pf_block = DirBlock; p_access->pf_seek = NULL; - p_access->pf_control= DirControl; - free (p_access->psz_demux); - p_access->psz_demux = strdup ("xspf-open"); - + p_access->pf_control = DirControl; return VLC_SUCCESS; error: @@ -483,6 +480,10 @@ int DirControl( access_t *p_access, int i_query, va_list args ) *va_arg( args, int64_t * ) = DEFAULT_PTS_DELAY * 1000; break; + case ACCESS_GET_CONTENT_TYPE: + *va_arg( args, char** ) = strdup("application/xspf+xml"); + return VLC_SUCCESS; + default: return VLC_EGENERIC; } _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits