vlc | branch: master | Steve Lhomme <[email protected]> | Tue Feb 4 14:27:53 2020 +0100| [0b9179a804f786e17ef79c45657cbd8e779c986a] | committer: Steve Lhomme
libvlc: rename the OpenGL callbacks cleanup callback type Avoid confusion with the cleanup callback from libvlc_video_set_format_callbacks even though the prototype is the same. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0b9179a804f786e17ef79c45657cbd8e779c986a --- include/vlc/libvlc_media_player.h | 4 ++-- lib/media_player.c | 2 +- modules/video_output/vgl.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h index a52bb7143a..1f89340a81 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -519,7 +519,7 @@ typedef bool (*libvlc_video_setup_cb)(void* opaque); * \param opaque private pointer passed to the @a libvlc_video_set_output_callbacks() [IN] * \version LibVLC 4.0.0 or later */ -typedef void (*libvlc_video_cleanup_cb)(void* opaque); +typedef void (*libvlc_video_output_cleanup_cb)(void* opaque); typedef struct { @@ -674,7 +674,7 @@ LIBVLC_API bool libvlc_video_set_output_callbacks( libvlc_media_player_t *mp, libvlc_video_engine_t engine, libvlc_video_setup_cb setup_cb, - libvlc_video_cleanup_cb cleanup_cb, + libvlc_video_output_cleanup_cb cleanup_cb, libvlc_video_update_output_cb update_output_cb, libvlc_video_swap_cb swap_cb, libvlc_video_makeCurrent_cb makeCurrent_cb, diff --git a/lib/media_player.c b/lib/media_player.c index 211b12704a..a03f42b9da 100644 --- a/lib/media_player.c +++ b/lib/media_player.c @@ -1035,7 +1035,7 @@ void libvlc_video_set_format( libvlc_media_player_t *mp, const char *chroma, bool libvlc_video_set_output_callbacks(libvlc_media_player_t *mp, libvlc_video_engine_t engine, libvlc_video_setup_cb setup_cb, - libvlc_video_cleanup_cb cleanup_cb, + libvlc_video_output_cleanup_cb cleanup_cb, libvlc_video_update_output_cb update_output_cb, libvlc_video_swap_cb swap_cb, libvlc_video_makeCurrent_cb makeCurrent_cb, diff --git a/modules/video_output/vgl.c b/modules/video_output/vgl.c index c2e41c6d87..2f17ac3e79 100644 --- a/modules/video_output/vgl.c +++ b/modules/video_output/vgl.c @@ -37,7 +37,7 @@ struct vout_display_sys_t { - libvlc_video_cleanup_cb cleanupCb; + libvlc_video_output_cleanup_cb cleanupCb; libvlc_video_setup_cb setupCb; libvlc_video_update_output_cb resizeCb; libvlc_video_swap_cb swapCb; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
