Browse Source

Do not forget marking disposed delayed pics as unused.

Fixes issue335

Originally committed as revision 14296 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 17 years ago
parent
commit
7c0efeccfa
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavcodec/h264.c

+ 2
- 1
libavcodec/h264.c View File

@@ -7866,6 +7866,8 @@ static int decode_frame(AVCodecContext *avctx,
s->avctx->has_b_frames++;
}

if(out_of_order || pics > s->avctx->has_b_frames)
out->reference &= ~DELAYED_PIC_REF;
if(pics <= s->avctx->has_b_frames || out_of_order)
out = NULL;

@@ -7877,7 +7879,6 @@ static int decode_frame(AVCodecContext *avctx,
if(out){
*data_size = sizeof(AVFrame);

out->reference &= ~DELAYED_PIC_REF;
h->outputed_poc = out->poc;
}
#endif


Loading…
Cancel
Save