[vlc-devel] commit: Always link/unlink picture in ffmpeg_GetFrame/ReleaseBuf. ( Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Apr 19 14:07:53 2009 +0200| [c825fbc4992aaecc1c96b165594ac07d12cbca9a] | committer: Laurent Aimar 

Always link/unlink picture in ffmpeg_GetFrame/ReleaseBuf.

It seems that the field AVFrame::reference may change between the 2 calls.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c825fbc4992aaecc1c96b165594ac07d12cbca9a
---

 modules/codec/avcodec/video.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 91e40ef..4aafc2e 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -943,10 +943,7 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
     p_ff_pic->linesize[2] = p_pic->p[2].i_pitch;
     p_ff_pic->linesize[3] = 0;
 
-    if( p_ff_pic->reference != 0 )
-    {
-        decoder_LinkPicture( p_dec, p_pic );
-    }
+    decoder_LinkPicture( p_dec, p_pic );
 
     /* FIXME what is that, should give good value */
     p_ff_pic->age = 256*256*256*64; // FIXME FIXME from ffmpeg
@@ -1010,7 +1007,6 @@ static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *p_context,
                                     AVFrame *p_ff_pic )
 {
     decoder_t *p_dec = (decoder_t *)p_context->opaque;
-    picture_t *p_pic;
 
     if( !p_ff_pic->opaque )
     {
@@ -1018,17 +1014,13 @@ static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *p_context,
         return;
     }
 
-    p_pic = (picture_t*)p_ff_pic->opaque;
+    picture_t *p_pic = (picture_t*)p_ff_pic->opaque;
+    decoder_UnlinkPicture( p_dec, p_pic );
 
     p_ff_pic->data[0] = NULL;
     p_ff_pic->data[1] = NULL;
     p_ff_pic->data[2] = NULL;
     p_ff_pic->data[3] = NULL;
-
-    if( p_ff_pic->reference != 0 )
-    {
-        decoder_UnlinkPicture( p_dec, p_pic );
-    }
 }
 
 static void ffmpeg_NextPts( decoder_t *p_dec )