[FFmpeg-cvslog] flvdec: Do not default to a video and audio stream

[Uwe L. Korn]

ffmpeg | branch: master | Uwe L. Korn <uwelk at xhochy.com> | Sat May 31 17:53:01 2014 +0100| [a1859032e39d96352687186fd179e1559dea2aca] | committer: Martin Storsjö

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>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a1859032e39d96352687186fd179e1559dea2aca
---

 libavformat/flvdec.c |    8 --------
 1 file changed, 8 deletions(-)

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;