Commit faa2930f authored by Michael Niedermayer's avatar Michael Niedermayer

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent a6f650af
...@@ -2556,7 +2556,7 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data, ...@@ -2556,7 +2556,7 @@ static int aac_decode_frame(AVCodecContext *avctx, void *data,
AV_PKT_DATA_NEW_EXTRADATA, AV_PKT_DATA_NEW_EXTRADATA,
&new_extradata_size); &new_extradata_size);
if (new_extradata) { if (new_extradata && 0) {
av_free(avctx->extradata); av_free(avctx->extradata);
avctx->extradata = av_mallocz(new_extradata_size + avctx->extradata = av_mallocz(new_extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE); FF_INPUT_BUFFER_PADDING_SIZE);
......
...@@ -618,7 +618,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -618,7 +618,7 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
if (flv->wrong_dts) if (flv->wrong_dts)
dts = AV_NOPTS_VALUE; 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 (st->codec->extradata) {
if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0) if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0)
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment