RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'a1859032e39d96352687186fd179e1559dea2aca'

Browse Source 
* commit 'a1859032e39d96352687186fd179e1559dea2aca':
  flvdec: Do not default to a video and audio stream

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-01 23:50:12 +02:00
commit 8225bf95bc
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/flvdec.c
View File

@ -574,14 +574,6 @@ static int flv_read_header(AVFormatContext *s)
avio_skip(s->pb, 4); avio_skip(s->pb, 4);
flags = avio_r8(s->pb); flags = avio_r8(s->pb);
/* old flvtool cleared this field */
/* FIXME: better fix needed */
if (!flags) {
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");
}
s->ctx_flags |= AVFMTCTX_NOHEADER; s->ctx_flags |= AVFMTCTX_NOHEADER;