vlc | branch: master | Steve Lhomme <[email protected]> | Tue Feb 4 15:23:12 2020 +0100| [9d42f750f9d7a5a0d59df79bc06ee4ed46e28073] | committer: Steve Lhomme
libvlc: merge libvlc_video_direct3d_device_cleanup_cb and libvlc_video_output_cleanup_cb > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9d42f750f9d7a5a0d59df79bc06ee4ed46e28073 --- include/vlc/libvlc_media_player.h | 9 +-------- lib/media_player.c | 2 +- modules/hw/d3d11/d3d11_device.c | 4 ++-- modules/hw/d3d9/d3d9_device.c | 4 ++-- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h index 14fa86045f..ce7335b85e 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -721,13 +721,6 @@ typedef enum libvlc_video_direct3d_engine_t { libvlc_video_direct3d_engine_d3d9, } libvlc_video_direct3d_engine_t; -/** Cleanup the rendering environment initialized during \ref libvlc_video_output_setup_cb. - * - * \param opaque private pointer set on the opaque parameter of @a libvlc_video_output_setup_cb() [IN] - * \version LibVLC 4.0.0 or later - */ -typedef void( *libvlc_video_direct3d_device_cleanup_cb )( void *opaque ); - /** Set the callback to call when the host app resizes the rendering area. * * This allows text rendering and aspect ratio to be handled properly when the host @@ -792,7 +785,7 @@ LIBVLC_API bool libvlc_video_direct3d_set_callbacks( libvlc_media_player_t *mp, libvlc_video_direct3d_engine_t engine, libvlc_video_output_setup_cb setup_cb, - libvlc_video_direct3d_device_cleanup_cb cleanup_cb, + libvlc_video_output_cleanup_cb cleanup_cb, libvlc_video_direct3d_set_resize_cb resize_cb, libvlc_video_update_output_cb update_output_cb, libvlc_video_swap_cb swap_cb, diff --git a/lib/media_player.c b/lib/media_player.c index 28bc6bafd0..8f77b65fb1 100644 --- a/lib/media_player.c +++ b/lib/media_player.c @@ -1076,7 +1076,7 @@ bool libvlc_video_set_output_callbacks(libvlc_media_player_t *mp, bool libvlc_video_direct3d_set_callbacks(libvlc_media_player_t *mp, libvlc_video_direct3d_engine_t engine, libvlc_video_output_setup_cb setup_cb, - libvlc_video_direct3d_device_cleanup_cb cleanup_cb, + libvlc_video_output_cleanup_cb cleanup_cb, libvlc_video_direct3d_set_resize_cb resize_cb, libvlc_video_update_output_cb update_output_cb, libvlc_video_swap_cb swap_cb, diff --git a/modules/hw/d3d11/d3d11_device.c b/modules/hw/d3d11/d3d11_device.c index 78108dc032..b4f620aa46 100644 --- a/modules/hw/d3d11/d3d11_device.c +++ b/modules/hw/d3d11/d3d11_device.c @@ -45,8 +45,8 @@ typedef struct { d3d11_handle_t hd3d; struct { - void *opaque; - libvlc_video_direct3d_device_cleanup_cb cleanupDeviceCb; + void *opaque; + libvlc_video_output_cleanup_cb cleanupDeviceCb; } external; d3d11_decoder_device_t dec_device; diff --git a/modules/hw/d3d9/d3d9_device.c b/modules/hw/d3d9/d3d9_device.c index a25f42add7..07b76be9cc 100644 --- a/modules/hw/d3d9/d3d9_device.c +++ b/modules/hw/d3d9/d3d9_device.c @@ -40,8 +40,8 @@ #include "d3d9_filters.h" typedef struct { - void *opaque; - libvlc_video_direct3d_device_cleanup_cb cleanupDeviceCb; + void *opaque; + libvlc_video_output_cleanup_cb cleanupDeviceCb; d3d9_decoder_device_t dec_device; } d3d9_decoder_device; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
