vlc | branch: master | Laurent Aimar <[email protected]> | Thu Jan 19 20:51:53 2012 +0100| [7090b8ef26e54c61b53fb5af19855f57029eada8] | committer: Laurent Aimar
Unexport now unused picture_Delete(). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7090b8ef26e54c61b53fb5af19855f57029eada8 --- include/vlc_picture.h | 9 --------- src/libvlccore.sym | 1 - src/misc/picture.c | 21 +++++++++++---------- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/include/vlc_picture.h b/include/vlc_picture.h index 10150ae..ee55349 100644 --- a/include/vlc_picture.h +++ b/include/vlc_picture.h @@ -151,15 +151,6 @@ typedef struct VLC_API picture_t * picture_NewFromResource( const video_format_t *, const picture_resource_t * ) VLC_USED; /** - * This function will force the destruction a picture. - * The value of the picture reference count should be 0 before entering this - * function. - * Unless used for reimplementing pf_release, you should not use this - * function but picture_Release. - */ -VLC_API void picture_Delete( picture_t * ); - -/** * This function will increase the picture reference count. * It will not have any effect on picture obtained from vout * diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 8348c7c..936bed1 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -309,7 +309,6 @@ osd_Volume path_sanitize picture_BlendSubpicture picture_CopyPixels -picture_Delete picture_Hold picture_Release picture_IsReferenced diff --git a/src/misc/picture.c b/src/misc/picture.c index 86b95f5..679a636 100644 --- a/src/misc/picture.c +++ b/src/misc/picture.c @@ -92,6 +92,17 @@ static int AllocatePicture( picture_t *p_pic, /***************************************************************************** * *****************************************************************************/ +static void picture_Delete( picture_t *p_picture ) +{ + assert( p_picture && p_picture->i_refcount == 0 ); + assert( p_picture->p_release_sys == NULL ); + + free( p_picture->p_q ); + vlc_free( p_picture->p_data_orig ); + free( p_picture->p_sys ); + free( p_picture ); +} + static void PictureReleaseCallback( picture_t *p_picture ) { if( --p_picture->i_refcount > 0 ) @@ -267,16 +278,6 @@ picture_t *picture_New( vlc_fourcc_t i_chroma, int i_width, int i_height, int i_ /***************************************************************************** * *****************************************************************************/ -void picture_Delete( picture_t *p_picture ) -{ - assert( p_picture && p_picture->i_refcount == 0 ); - assert( p_picture->p_release_sys == NULL ); - - free( p_picture->p_q ); - vlc_free( p_picture->p_data_orig ); - free( p_picture->p_sys ); - free( p_picture ); -} picture_t *picture_Hold( picture_t *p_picture ) { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
