forked from FFmpeg/FFmpeg
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
This commit is contained in:
parent
5d55bb9f11
commit
a5266a4789
1 changed files with 8 additions and 0 deletions
|
@ -1044,7 +1044,15 @@ static int av_read_frame_internal(AVFormatContext *s, AVPacket *pkt)
|
||||||
pkt->pts = st->parser->pts;
|
pkt->pts = st->parser->pts;
|
||||||
pkt->dts = st->parser->dts;
|
pkt->dts = st->parser->dts;
|
||||||
pkt->pos = st->parser->pos;
|
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;
|
pkt->destruct = NULL;
|
||||||
|
}
|
||||||
compute_pkt_fields(s, st, st->parser, pkt);
|
compute_pkt_fields(s, st, st->parser, pkt);
|
||||||
|
|
||||||
if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & AV_PKT_FLAG_KEY){
|
if((s->iformat->flags & AVFMT_GENERIC_INDEX) && pkt->flags & AV_PKT_FLAG_KEY){
|
||||||
|
|
Loading…
Add table
Reference in a new issue