Skip to content

V
vlc-2-2
Commit faba6169 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed avcodec picture reference counts.

parent 958ae35d
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
modules/codec/avcodec/video.c
View file @ faba6169
...@@ -607,7 +607,11 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) ...@@ -607,7 +607,11 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
/* Do not display the picture */ /* Do not display the picture */
p_pic = (picture_t *)p_sys->p_ff_pic->opaque; p_pic = (picture_t *)p_sys->p_ff_pic->opaque;
if( !b_drawpicture && p_pic ) if( !b_drawpicture && p_pic )
{
if( p_sys->p_ff_pic->opaque )
decoder_LinkPicture( p_dec, p_pic );
decoder_DeletePicture( p_dec, p_pic ); decoder_DeletePicture( p_dec, p_pic );
}
ffmpeg_NextPts( p_dec ); ffmpeg_NextPts( p_dec );
continue; continue;
...@@ -630,6 +634,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) ...@@ -630,6 +634,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
else else
{ {
p_pic = (picture_t *)p_sys->p_ff_pic->opaque; p_pic = (picture_t *)p_sys->p_ff_pic->opaque;
decoder_LinkPicture( p_dec, p_pic );
} }
/* Sanity check (seems to be needed for some streams) */ /* Sanity check (seems to be needed for some streams) */
...@@ -991,8 +996,6 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context, ...@@ -991,8 +996,6 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
p_ff_pic->linesize[2] = p_pic->p[2].i_pitch; p_ff_pic->linesize[2] = p_pic->p[2].i_pitch;
p_ff_pic->linesize[3] = 0; p_ff_pic->linesize[3] = 0;
decoder_LinkPicture( p_dec, p_pic );
/* FIXME what is that, should give good value */ /* FIXME what is that, should give good value */
p_ff_pic->age = 256*256*256*64; // FIXME FIXME from ffmpeg p_ff_pic->age = 256*256*256*64; // FIXME FIXME from ffmpeg
......
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