]> git.sesse.net Git - ffmpeg/commit
avformat/flvdec: RtmpSampleAccess no longer breaks stream detection
authorPeter van der Spek <p.vanderspek@bluebillywig.com>
Wed, 19 Aug 2020 07:06:54 +0000 (09:06 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 23 Sep 2020 19:33:21 +0000 (21:33 +0200)
commitc476cfd7ece24f8f5a458529d25c9b79a4fb24c7
tree85b4af9907e6357b7d1109b1d69fd8d0ef4af57f
parenteb6bb8f32fdc9be89cce65869dce9dd950e91be2
avformat/flvdec: RtmpSampleAccess no longer breaks stream detection

Since release 4.2, FFmpeg fails to detect the correct streams in an RTMP
stream that contains a |RtmpSampleAccess AMF object prior to the
onMetaData AMF object. In the debug log it would show "[flv] Unknown
type |RtmpSampleAccess".

This functionality broke in commit d7638d8dfc3c4ffd0dc18a64937a5a07ed67b354
as unknown metadata packets now result in an opaque data stream, and the
|RtmpSampleAccess packet was an "unknown" metadata packet type.

With this change the RTMP streams are correctly detected when there
is a |RtmpSampleAccess object prior to the onMetaData object.

Signed-off-by: Peter van der Spek <p.vanderspek@bluebillywig.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/flvdec.c