vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Jul 14 19:17:48 2016 +0200| [6cb361c1fb83c026cb9303db65e27d95b3d077cc] | committer: Francois Cartegnie
demux: hls: add basic support for mp4 containers > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6cb361c1fb83c026cb9303db65e27d95b3d077cc --- modules/demux/hls/HLSStreams.cpp | 4 ++++ modules/demux/hls/playlist/Parser.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/modules/demux/hls/HLSStreams.cpp b/modules/demux/hls/HLSStreams.cpp index e767852..c17bfd0 100644 --- a/modules/demux/hls/HLSStreams.cpp +++ b/modules/demux/hls/HLSStreams.cpp @@ -67,6 +67,10 @@ AbstractDemuxer * HLSStream::createDemux(const StreamFormat &format) ret = new Demuxer(p_realdemux, "ts", fakeesout->getEsOut(), demuxersource); break; + case StreamFormat::MP4: + ret = new Demuxer(p_realdemux, "mp4", fakeesout->getEsOut(), demuxersource); + break; + default: case StreamFormat::UNSUPPORTED: break; diff --git a/modules/demux/hls/playlist/Parser.cpp b/modules/demux/hls/playlist/Parser.cpp index fd044bc..4dc909f 100644 --- a/modules/demux/hls/playlist/Parser.cpp +++ b/modules/demux/hls/playlist/Parser.cpp @@ -88,6 +88,10 @@ void M3U8Parser::setFormatFromExtension(Representation *rep, const std::string & { rep->streamFormat = StreamFormat(StreamFormat::MPEG2TS); } + else if(extension == "mp4" || extension == "m4s" || extension == "mov" || extension == "m4v") + { + rep->streamFormat = StreamFormat(StreamFormat::MP4); + } else { rep->streamFormat = StreamFormat(StreamFormat::UNSUPPORTED); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
