virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

flvdec: do not create any streams in read_header()

Browse Source 
The current muxer behaviour is to create streams in read_header() based
on the audio/video presence flags, but fill in the stream parameters
later when we actually get some packets for them. This is rather shady,
since other demuxers set the stream parameters immediately when the
stream is created and do not touch the stream codec context after that.

Change the flv demuxer to behave in the same way as other similar
demuxers -- create the streams only when we get a packet for them.
This commit is contained in:
Anton Khirnov 2015-10-11 11:08:24 +02:00
parent de9e199a03
commit 09ae7b81ea
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/flvdec.c
View File

@ -558,20 +558,13 @@ static int flv_read_metabody(AVFormatContext *s, int64_t next_pos)
static int flv_read_header(AVFormatContext *s) static int flv_read_header(AVFormatContext *s)
{ {
int offset, flags; int offset;
avio_skip(s->pb, 4); avio_skip(s->pb, 4);
flags = avio_r8(s->pb); avio_r8(s->pb); // flags
s->ctx_flags |= AVFMTCTX_NOHEADER; s->ctx_flags |= AVFMTCTX_NOHEADER;
if (flags & FLV_HEADER_FLAG_HASVIDEO)
if (!create_stream(s, AVMEDIA_TYPE_VIDEO))
return AVERROR(ENOMEM);
if (flags & FLV_HEADER_FLAG_HASAUDIO)
if (!create_stream(s, AVMEDIA_TYPE_AUDIO))
return AVERROR(ENOMEM);
offset = avio_rb32(s->pb); offset = avio_rb32(s->pb);
avio_seek(s->pb, offset, SEEK_SET); avio_seek(s->pb, offset, SEEK_SET);
avio_skip(s->pb, 4); avio_skip(s->pb, 4);