RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 14:39:30 +00:00
Code Issues Projects Releases Wiki Activity

Make detection of single-stream flv work again.

Browse Source 
It had become dead code when code was added to avoid
exporting audio and video codec id as metadata.
Untested due to lack of sample.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2011-12-07 21:51:27 +01:00
parent cc61643123
commit 8b8a47f6fb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/flvdec.c
View File

@ -292,6 +292,11 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
acodec->bit_rate = num_val * 1024.0; acodec->bit_rate = num_val * 1024.0;
} }
if (amf_type == AMF_DATA_TYPE_OBJECT && 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
if (!strcmp(key, "duration") || if (!strcmp(key, "duration") ||
!strcmp(key, "filesize") || !strcmp(key, "filesize") ||
!strcmp(key, "width") || !strcmp(key, "width") ||
@ -312,10 +317,6 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, AVStream *vst
} else if(amf_type == AMF_DATA_TYPE_NUMBER) { } else if(amf_type == AMF_DATA_TYPE_NUMBER) {
snprintf(str_val, sizeof(str_val), "%.f", num_val); snprintf(str_val, sizeof(str_val), "%.f", num_val);
av_dict_set(&s->metadata, key, str_val, 0); av_dict_set(&s->metadata, key, str_val, 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) } else if (amf_type == AMF_DATA_TYPE_STRING)
av_dict_set(&s->metadata, key, str_val, 0); av_dict_set(&s->metadata, key, str_val, 0);
} }