summaryrefslogtreecommitdiff
path: root/libavformat/flvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-21 20:21:55 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-05-21 21:19:43 +0200
commitfaa2930f191099621e03c55cca32662467d3cc15 (patch)
tree1abc71e00145915365cdbf4489149265cff8c67b /libavformat/flvdec.c
parenta6f650af8d864abbf248fd423e900a4754cfca6e (diff)
flvdec: reenable extradata passing code
This fixes passing junk in stream. It should not have any user vissible effect. We are discarding the new data in the decoder as no case is known where it is needed but it causes problems if used. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/flvdec.c')
-rw-r--r--libavformat/flvdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index 9f454474b2..d4cc7b9a83 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -618,7 +618,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
if (flv->wrong_dts)
dts = AV_NOPTS_VALUE;
}
- if (type == 0 && !st->codec->extradata) {
+ if (type == 0 && (!st->codec->extradata || st->codec->codec_id == CODEC_ID_AAC)) {
if (st->codec->extradata) {
if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0)
return ret;