diff options
| author | Asad Mehmood <asad78611@googlemail.com> | 2011-09-07 23:18:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-08 00:26:28 +0200 |
| commit | bcc531f04a0590732d42da133c11c138e8d08b59 (patch) | |
| tree | 4aa01d99f7ba38590abac3dc582aa95d1c97a4fb | |
| parent | f1b5693027d48a9e448f21595fb9247893c225cf (diff) | |
| download | ffmpeg-bcc531f04a0590732d42da133c11c138e8d08b59.tar.gz | |
flvdec: Remove AVFMTCTX_NOHEADER if both flags and metadata claim 1 stream
If there is only 1 stream in an flv avformat_find_stream_info will continually
read until probesize is reached. This should stop it reading if the metadata
also claims there to be 1 stream.
| -rw-r--r-- | libavformat/flvdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 263a843b7e..ef487a694f 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -275,6 +275,10 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst vcodec->bit_rate = num_val * 1024.0; else if(!strcmp(key, "audiodatarate") && acodec && 0 <= (int)(num_val * 1024.0)) acodec->bit_rate = num_val * 1024.0; + } else if(amf_type == AMF_DATA_TYPE_OBJECT){ + if(s->nb_streams==1 && ((!acodec && !strcmp(key, "audiocodecid")) || (!vcodec && !strcmp(key, "videocodecid")))){ + s->ctx_flags &= ~AVFMTCTX_NOHEADER; //If there is either audio/video missing, codecid will be an empty object + } } else if (amf_type == AMF_DATA_TYPE_STRING) av_dict_set(&s->metadata, key, str_val, 0); } |