vlc | branch: master | Laurent Aimar <[email protected]> | Thu Jan 19 20:49:03 2012 +0100| [71edfa9132733628a7ab457076197e49567614fb] | committer: Laurent Aimar
Used picture_Release when applicable. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=71edfa9132733628a7ab457076197e49567614fb --- modules/video_output/opengl.c | 2 +- src/misc/image.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c index 98ddd31..d18e096 100644 --- a/modules/video_output/opengl.c +++ b/modules/video_output/opengl.c @@ -485,7 +485,7 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl, unsigned error: for (unsigned i = 0; i < count; i++) - picture_Delete(picture[i]); + picture_Release(picture[i]); return NULL; } diff --git a/src/misc/image.c b/src/misc/image.c index 0902bd0..d9f7956 100644 --- a/src/misc/image.c +++ b/src/misc/image.c @@ -633,11 +633,8 @@ static picture_t *video_new_buffer( decoder_t *p_dec ) static void video_del_buffer( decoder_t *p_dec, picture_t *p_pic ) { - if( p_pic->i_refcount != 1 ) - msg_Err( p_dec, "invalid picture reference count" ); - - p_pic->i_refcount = 0; - picture_Delete( p_pic ); + (void)p_dec; + picture_Release( p_pic ); } static void video_link_picture( decoder_t *p_dec, picture_t *p_pic ) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
