changeset 6062:92871def02f1 libavformat

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().
author michael
date Thu, 27 May 2010 17:11:37 +0000
parents f2241323dca3
children 817a86ec7ad2
files utils.c
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/utils.c	Wed May 26 22:26:19 2010 +0000
+++ b/utils.c	Thu May 27 17:11:37 2010 +0000
@@ -1044,7 +1044,15 @@
                     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){