vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Oct 30 23:00:11 2014 +0200| [44ea680b068b2a4bed38d9db97dcb33fd2d4e37b] | committer: Rémi Denis-Courmont
vout: remove vout_HoldPicture() > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=44ea680b068b2a4bed38d9db97dcb33fd2d4e37b --- include/vlc_vout.h | 1 - src/input/decoder.c | 2 +- src/libvlccore.sym | 1 - src/video_output/video_output.c | 11 +---------- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/include/vlc_vout.h b/include/vlc_vout.h index b39e49b..108459e 100644 --- a/include/vlc_vout.h +++ b/include/vlc_vout.h @@ -152,7 +152,6 @@ VLC_API void vout_ChangeAspectRatio( vout_thread_t *p_vout, VLC_API picture_t * vout_GetPicture( vout_thread_t * ); VLC_API void vout_PutPicture( vout_thread_t *, picture_t * ); -VLC_API void vout_HoldPicture( vout_thread_t *, picture_t * ); VLC_API void vout_ReleasePicture( vout_thread_t *, picture_t * ); /* */ diff --git a/src/input/decoder.c b/src/input/decoder.c index fe8d669..afc90e3 100644 --- a/src/input/decoder.c +++ b/src/input/decoder.c @@ -2198,7 +2198,7 @@ static void vout_del_buffer( decoder_t *p_dec, picture_t *p_pic ) static void vout_link_picture( decoder_t *p_dec, picture_t *p_pic ) { - vout_HoldPicture( p_dec->p_owner->p_vout, p_pic ); + picture_Hold( p_pic ); } static void vout_unlink_picture( decoder_t *p_dec, picture_t *p_pic ) diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 4dd9c3a..03b3882 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -615,7 +615,6 @@ vout_ChangeAspectRatio vout_Close vout_GetPicture vout_PutPicture -vout_HoldPicture vout_ReleasePicture vout_PutSubpicture vout_RegisterSubpictureChannel diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c index 44f470e..2fc8f65 100644 --- a/src/video_output/video_output.c +++ b/src/video_output/video_output.c @@ -407,7 +407,7 @@ void vout_FlushSubpictureChannel( vout_thread_t *vout, int channel ) * * You MUST call vout_PutPicture or vout_ReleasePicture on it. * - * You may use vout_HoldPicture(paired with vout_ReleasePicture) to keep a + * You may use picture_Hold() (paired with vout_ReleasePicture()) to keep a * read-only reference. */ picture_t *vout_GetPicture(vout_thread_t *vout) @@ -452,15 +452,6 @@ void vout_ReleasePicture(vout_thread_t *vout, picture_t *picture) vlc_mutex_unlock(&vout->p->picture_lock); } -/** - * It increment the reference counter of a picture retreived by - * vout_GetPicture. - */ -void vout_HoldPicture(vout_thread_t *vout, picture_t *picture) -{ - picture_Hold(picture); -} - /* */ int vout_GetSnapshot(vout_thread_t *vout, block_t **image_dst, picture_t **picture_dst, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
