revert r12809
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Apr 2008 12:10:53 +0000 (12:10 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Apr 2008 12:10:53 +0000 (12:10 +0000)
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

libavformat/flvdec.c

index 1dd79f3..a4678f5 100644 (file)
@@ -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))