diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 23:50:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-01 23:51:41 +0200 |
| commit | 8225bf95bc3ffc9757879d2eb092cf3fa9d6b26f (patch) | |
| tree | 7fccffbb13b120396c6f36a61f6b82b1123d86ee /libavformat/flvdec.c | |
| parent | dcd2a6ca36a42b39867c39720344422161893178 (diff) | |
| parent | a1859032e39d96352687186fd179e1559dea2aca (diff) | |
| download | ffmpeg-streaming-8225bf95bc3ffc9757879d2eb092cf3fa9d6b26f.zip ffmpeg-streaming-8225bf95bc3ffc9757879d2eb092cf3fa9d6b26f.tar.gz | |
Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'
* commit 'a1859032e39d96352687186fd179e1559dea2aca':
flvdec: Do not default to a video and audio stream
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvdec.c')
| -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 c0eddd3..e113cc3 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -574,14 +574,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; |
