diff options
author | wm4 <wm4@nowhere> | 2018-09-15 22:37:14 +0200 |
---|---|---|
committer | sfan5 <sfan5@live.de> | 2018-10-01 10:41:01 +0200 |
commit | 315004a38a1bf9394507d8ca308da1ce86ca2204 (patch) | |
tree | 265a9c265e1b5b66b4b60d6f9b950b6156a4a2fd | |
parent | 7e85dc2167b7524308159915d5c1d3341464977f (diff) | |
download | mpv-315004a38a1bf9394507d8ca308da1ce86ca2204.tar.bz2 mpv-315004a38a1bf9394507d8ca308da1ce86ca2204.tar.xz |
demux_lavf: hack-fix EDL mp4 DASH hack
I encountered a stream that fails with "Could not demux init fragment.".
It turns out this is a regression from the recent change to that code.
The assumption was that demux_lavf.c would treat this as concatenated
stream - which it does, but not for probing.
Doing this transparently is hard without doing it properly. Doing it
properly would mean creating some sort of stream_concat (reminiscent of
that FFmpeg security bug). I probably don't want to go there, and I
think libavformat should just support this directly, so whatever.
Hack-fix this with the knowledge that the init segment will always
contain the headers.
-rw-r--r-- | demux/demux_lavf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 54c144bcc1..b1800018c4 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -430,6 +430,10 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) int nsize = av_clip(avpd.buf_size * 2, INITIAL_PROBE_SIZE, PROBE_BUF_SIZE); bstr buf = stream_peek(s, nsize); + if (demuxer->params && demuxer->params->init_fragment.len) { + buf = demuxer->params->init_fragment; + buf.len = MPMIN(buf.len, nsize); + } if (buf.len <= avpd.buf_size) final_probe = true; memcpy(avpd.buf, buf.start, buf.len); |