vlc | branch: master | Thomas Guillem <[email protected]> | Thu Mar 7 15:53:53 2019 +0100| [a955f4911b5fc1cbb12d026d9b51d66d9b2b85d0] | committer: Thomas Guillem
vout: make vout_Flush public > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a955f4911b5fc1cbb12d026d9b51d66d9b2b85d0 --- include/vlc_vout.h | 10 ++++++++++ src/libvlccore.sym | 1 + src/video_output/vout_internal.h | 11 ----------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/vlc_vout.h b/include/vlc_vout.h index f2b0f24f50..1d4e9ffcec 100644 --- a/include/vlc_vout.h +++ b/include/vlc_vout.h @@ -119,6 +119,16 @@ VLC_API void vout_PutPicture( vout_thread_t *, picture_t * ); VLC_API void vout_PutSubpicture( vout_thread_t *, subpicture_t * ); VLC_API int vout_RegisterSubpictureChannel( vout_thread_t * ); VLC_API void vout_FlushSubpictureChannel( vout_thread_t *, int ); +/** + * This function will ensure that all ready/displayed pictures have at most + * the provided date. + */ +VLC_API void vout_Flush( vout_thread_t *p_vout, vlc_tick_t i_date ); + +/** + * Empty all the pending pictures in the vout + */ +#define vout_FlushAll( vout ) vout_Flush( vout, VLC_TICK_INVALID ) /**@}*/ diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 9f1df91346..18b67c4c41 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -749,6 +749,7 @@ vout_PutPicture vout_PutSubpicture vout_RegisterSubpictureChannel vout_FlushSubpictureChannel +vout_Flush vout_GetSnapshot vout_OSDIcon vout_OSDMessageVa diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h index b43d323fb0..1912d855a0 100644 --- a/src/video_output/vout_internal.h +++ b/src/video_output/vout_internal.h @@ -304,17 +304,6 @@ void spu_OffsetSubtitleDate( spu_t *p_spu, vlc_tick_t i_duration ); void vout_GetResetStatistic( vout_thread_t *p_vout, unsigned *pi_displayed, unsigned *pi_lost ); -/** - * This function will ensure that all ready/displayed pictures have at most - * the provided date. - */ -void vout_Flush( vout_thread_t *p_vout, vlc_tick_t i_date ); - -/** - * Empty all the pending pictures in the vout - */ -#define vout_FlushAll( vout ) vout_Flush( vout, VLC_TICK_INVALID ) - /* * Cancel the vout, if cancel is true, it won't return any pictures after this * call. _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
