[SCM] libav/experimental: flvdec: Do not default to a video and audio stream

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a1859032e39d96352687186fd179e1559dea2aca
Author: Uwe L. Korn <uwelk at xhochy.com>
Date:   Sat May 31 17:53:01 2014 +0100

    flvdec: Do not default to a video and audio stream
    
    If no streams were indicated in the FLV header, do not automatically
    allocate by default a video and an audio stream. Instead, in the case
    that the header did not indicate the presence of any data, allocate no
    stream until data actually arrives for one type.
    
    Signed-off-by: Martin Storsjö <martin at martin.st>

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 3772cd9..8e4cc5e 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -559,14 +559,6 @@ static int flv_read_header(AVFormatContext *s)
 
     avio_skip(s->pb, 4);
     flags = avio_r8(s->pb);
-    /* old flvtool cleared this field */
-    /* FIXME: better fix needed */
-    if (!flags) {
-        flags = FLV_HEADER_FLAG_HASVIDEO | FLV_HEADER_FLAG_HASAUDIO;
-        av_log(s, AV_LOG_WARNING,
-               "Broken FLV file, which says no streams present, "
-               "this might fail.\n");
-    }
 
     s->ctx_flags |= AVFMTCTX_NOHEADER;
 

-- 
Libav/FFmpeg packaging