diff --git a/Makefile.am b/Makefile.am index 43c0b59d3ba557a5475c31e2a1822680aa893c07..a14239631a5b62b5bd9d56cfef7269fc6b80a8f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -249,7 +249,7 @@ nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc) vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) -vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` +vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -no-install if !HAVE_PLUGINS vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'` endif diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c index 599c7671eae658b376df804a16c6c0dd934cb038..f47e55cccffccb2b4dd2622b34a66a9c42410fc4 100644 --- a/modules/demux/playlist/xspf.c +++ b/modules/demux/playlist/xspf.c @@ -769,8 +769,9 @@ static vlc_bool_t parse_extension_node COMPLEX_INTERFACE if( !p_handler || !p_handler->name || strcmp( p_handler->name, psz_name )) { + /* FIXME: see #1293 msg_Err( p_demux, "there's no open element left for <%s>", - psz_name ); + psz_name );*/ FREE_ATT(); return VLC_FALSE; }