[FFmpeg-devel] [PATCH] avformat/flvdec: RtmpSampleAccess no longer breaks stream detection

[Andreas Rheinhardt]

Peter van der Spek:
> 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".
> 
> 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 at bluebillywig.com>
> ---
>  libavformat/flvdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
> index 0862273..d480d0b 100644
> --- a/libavformat/flvdec.c
> +++ b/libavformat/flvdec.c
> @@ -715,7 +715,7 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos)
>      if (!strcmp(buffer, "onCaptionInfo"))
>          return TYPE_ONCAPTIONINFO;
>  
> -    if (strcmp(buffer, "onMetaData") && strcmp(buffer, "onCuePoint")) {
> +    if (strcmp(buffer, "onMetaData") && strcmp(buffer, "onCuePoint") && strcmp(buffer, "|RtmpSampleAccess")) {
>          av_log(s, AV_LOG_DEBUG, "Unknown type %s\n", buffer);
>          return TYPE_UNKNOWN;
>      }
> 
Which commit broke it? (That should be included in the commit message.)

- Andreas