From a5266a4789dd9477e062c28ae1ae00dfb75c038a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 27 May 2010 17:11:37 +0000 Subject: [PATCH] Make sure that when the parser is feeded with frame==packet that the packets are passed through and wont be marked as static which would require them to be copied by av_dup_packet(). Originally committed as revision 23352 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index d1b77705e5..bd8c6bc37d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1044,7 +1044,15 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt) pkt->pts = st->parser->pts; pkt->dts = st->parser->dts; pkt->pos = st->parser->pos; + if(pkt->data == st->cur_pkt.data && pkt->size == st->cur_pkt.size){ + s->cur_st = NULL; + pkt->destruct= st->cur_pkt.destruct; + st->cur_pkt.destruct= + st->cur_pkt.data = NULL; + assert(st->cur_len == 0); + }else{ pkt->destruct = NULL; + } compute_pkt_fields(s, st, st->parser, pkt); if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & AV_PKT_FLAG_KEY){