Skip to content
Snippets Groups Projects
Commit f272deef authored by François Cartegnie's avatar François Cartegnie :fingers_crossed: Committed by Steve Lhomme
Browse files

demux: hls: only force AAC on es demux

shortcuts will enforce wrong profile and
demux will never end

regression by fix 2396e15b
parent 39e1b723
No related branches found
No related tags found
1 merge request!3814demux: hls: only force AAC on es demux
Pipeline #356596 passed with stages
in 25 minutes and 38 seconds
...@@ -195,13 +195,11 @@ AbstractDemuxer *HLSStream::newDemux(vlc_object_t *p_obj, const StreamFormat &fo ...@@ -195,13 +195,11 @@ AbstractDemuxer *HLSStream::newDemux(vlc_object_t *p_obj, const StreamFormat &fo
switch(format) switch(format)
{ {
case StreamFormat::Type::PackedAAC: case StreamFormat::Type::PackedAAC:
ret = new Demuxer(p_obj, "aac", out, source); ret = new Demuxer(p_obj, "aac", out, source); /* "es" demuxer cannot probe AAC, need to force */
break; break;
case StreamFormat::Type::PackedMP3: case StreamFormat::Type::PackedMP3: /* MPGA / MP3, needs "es" to probe: do not force */
ret = new Demuxer(p_obj, "mp3", out, source); case StreamFormat::Type::PackedAC3: /* AC3 / E-AC3, needs "es" to probe: do not force */
break; ret = new Demuxer(p_obj, "es", out, source);
case StreamFormat::Type::PackedAC3:
ret = new Demuxer(p_obj, "ac3", out, source);
break; break;
case StreamFormat::Type::MPEG2TS: case StreamFormat::Type::MPEG2TS:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment