summaryrefslogtreecommitdiff
path: root/libavformat/flvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-04-14 12:10:53 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-04-14 12:10:53 +0000
commit26d95a1ecf0b841bad3cbdb18bf1654fef2ec270 (patch)
tree809fda046ce55df1260c66f90c27fd6e9916b676 /libavformat/flvdec.c
parenta33cfa3071eb2a1a501223469c33252054a798ed (diff)
revert r12809
Log: 10l Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found. fixes WELCOMETOBELGRADE.flv As it unexpectly breaks seek regression tests. Originally committed as revision 12811 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/flvdec.c')
-rw-r--r--libavformat/flvdec.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 1dd79f3478..a4678f5ab0 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -256,9 +256,6 @@ static int flv_read_header(AVFormatContext *s,
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");
}
- if((flags & (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO))
- != (FLV_HEADER_FLAG_HASVIDEO|FLV_HEADER_FLAG_HASAUDIO))
- s->ctx_flags |= AVFMTCTX_NOHEADER;
if(flags & FLV_HEADER_FLAG_HASVIDEO){
if(!create_stream(s, 0))