[FFmpeg-cvslog] r12811 - trunk/libavformat/flvdec.c
michael
subversion
Mon Apr 14 14:10:54 CEST 2008
Author: michael
Date: Mon Apr 14 14:10:53 2008
New Revision: 12811
Log:
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.
Modified:
trunk/libavformat/flvdec.c
Modified: trunk/libavformat/flvdec.c
==============================================================================
--- trunk/libavformat/flvdec.c (original)
+++ trunk/libavformat/flvdec.c Mon Apr 14 14:10:53 2008
@@ -256,9 +256,6 @@ static int flv_read_header(AVFormatConte
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))
More information about the ffmpeg-cvslog
mailing list