vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Mon Apr 16 17:32:47 2018 +0300| [ef99cf2d66b7c2601d743e3728c0ea70d7f7935c] | committer: Rémi Denis-Courmont
demux: remove constant demux_New() parameter > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ef99cf2d66b7c2601d743e3728c0ea70d7f7935c --- include/vlc_demux.h | 2 +- modules/demux/adaptive/plumbing/Demuxer.cpp | 2 +- src/input/demux.c | 5 ++--- test/src/input/demux-run.c | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/vlc_demux.h b/include/vlc_demux.h index 402930bb5a..570234fe78 100644 --- a/include/vlc_demux.h +++ b/include/vlc_demux.h @@ -275,7 +275,7 @@ enum demux_query_e *************************************************************************/ VLC_API demux_t *demux_New( vlc_object_t *p_obj, const char *psz_name, - const char *psz_path, stream_t *s, es_out_t *out ); + stream_t *s, es_out_t *out ); static inline void demux_Delete(demux_t *demux) { diff --git a/modules/demux/adaptive/plumbing/Demuxer.cpp b/modules/demux/adaptive/plumbing/Demuxer.cpp index caf78c5667..213424cd96 100644 --- a/modules/demux/adaptive/plumbing/Demuxer.cpp +++ b/modules/demux/adaptive/plumbing/Demuxer.cpp @@ -171,7 +171,7 @@ bool Demuxer::create() if(!p_newstream) return false; - p_demux = demux_New( VLC_OBJECT(p_realdemux), name.c_str(), "", + p_demux = demux_New( VLC_OBJECT(p_realdemux), name.c_str(), p_newstream, p_es_out ); if(!p_demux) { diff --git a/src/input/demux.c b/src/input/demux.c index 988be5b701..8700f729a7 100644 --- a/src/input/demux.c +++ b/src/input/demux.c @@ -139,11 +139,10 @@ static const char* DemuxNameFromExtension( char const* ext, } demux_t *demux_New( vlc_object_t *p_obj, const char *psz_name, - const char *psz_location, stream_t *s, es_out_t *out ) + stream_t *s, es_out_t *out ) { assert(s != NULL ); - return demux_NewAdvanced( p_obj, NULL, "", psz_name, - psz_location, s, out, false ); + return demux_NewAdvanced( p_obj, NULL, "", psz_name, "", s, out, false ); } struct vlc_demux_private diff --git a/test/src/input/demux-run.c b/test/src/input/demux-run.c index 416436fcf1..cedd693aaa 100644 --- a/test/src/input/demux-run.c +++ b/test/src/input/demux-run.c @@ -267,7 +267,7 @@ static int demux_process_stream(const struct vlc_run_args *args, stream_t *s) if (out == NULL) return -1; - demux_t *demux = demux_New(VLC_OBJECT(s), name, "", s, out); + demux_t *demux = demux_New(VLC_OBJECT(s), name, s, out); if (demux == NULL) { es_out_Delete(out); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
