summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-04-14 12:24:29 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-04-14 12:24:29 +0000
commitb41497e90333a79e02c781d93eb440f39d67b48d (patch)
tree45a0eb6dbfc49654e6c38050585823fa8ff5e178
parent0366654e2b39966b8c57a04ecc5db5f33574a952 (diff)
downloadffmpeg-streaming-b41497e90333a79e02c781d93eb440f39d67b48d.zip
ffmpeg-streaming-b41497e90333a79e02c781d93eb440f39d67b48d.tar.gz
Recommit r12809
Log: 10l Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found. fixes WELCOMETOBELGRADE.flv After seeking bug has been fixed. Originally committed as revision 12813 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/flvdec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 39df35c..b19482f 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -257,6 +257,10 @@ static int flv_read_header(AVFormatContext *s,
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))
return AVERROR(ENOMEM);
OpenPOWER on IntegriCloud