diff options
| author | Uwe L. Korn <uwelk@xhochy.com> | 2014-05-31 17:53:01 +0100 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2014-06-01 23:29:40 +0300 |
| commit | a1859032e39d96352687186fd179e1559dea2aca (patch) | |
| tree | 47723cddb5dcc98ae7f5585f6b4c7f250777af08 | |
| parent | f76e3669bb350ca6df150244f3d28d7dc5599f01 (diff) | |
| download | ffmpeg-a1859032e39d96352687186fd179e1559dea2aca.tar.gz | |
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@martin.st>
| -rw-r--r-- | libavformat/flvdec.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 3772cd967f..8e4cc5e09d 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; |