From 6d789f50d261e4c0c2a8b02edbb86fd77247322c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 23 Sep 2011 05:45:26 +0200 Subject: flvdec: Inject in stream extradata, into the stream. The code before was unsafe, had a race condition and could crash. This Fixes Ticket499 Signed-off-by: Michael Niedermayer --- libavformat/flvdec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libavformat/flvdec.c') diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index ef487a694f..74330e8658 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -505,7 +505,8 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) if (flv->wrong_dts) dts = AV_NOPTS_VALUE; } - if (type == 0) { + + if (type == 0 && !st->codec->extradata) { if ((ret = flv_get_extradata(s, st, size)) < 0) return ret; if (st->codec->codec_id == CODEC_ID_AAC) { -- cgit v1.2.3