vlc | branch: master | Steve Lhomme <[email protected]> | Tue Oct 6 11:10:03 2020 +0200| [190636ad0885db511eb40acfa29f9cb5e07bc2f0] | committer: Steve Lhomme
i420_rgb: set the Close callback in the generated operations structure > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=190636ad0885db511eb40acfa29f9cb5e07bc2f0 --- modules/video_chroma/i420_rgb.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/modules/video_chroma/i420_rgb.c b/modules/video_chroma/i420_rgb.c index 20bb2eadbe..4ea5e2cec8 100644 --- a/modules/video_chroma/i420_rgb.c +++ b/modules/video_chroma/i420_rgb.c @@ -55,7 +55,7 @@ static void Set8bppPalette( filter_t *, uint8_t * ); * Module descriptor. *****************************************************************************/ static int Activate ( vlc_object_t * ); -static void Deactivate ( vlc_object_t * ); +static void Deactivate ( filter_t * ); vlc_module_begin () #if defined (SSE2) @@ -74,20 +74,20 @@ vlc_module_begin () set_capability( "video converter", 80 ) # define vlc_CPU_capable() (true) #endif - set_callbacks( Activate, Deactivate ) + set_callback( Activate ) vlc_module_end () #ifndef PLAIN -VIDEO_FILTER_WRAPPER( I420_R5G5B5 ) -VIDEO_FILTER_WRAPPER( I420_R5G6B5 ) -VIDEO_FILTER_WRAPPER( I420_A8R8G8B8 ) -VIDEO_FILTER_WRAPPER( I420_R8G8B8A8 ) -VIDEO_FILTER_WRAPPER( I420_B8G8R8A8 ) -VIDEO_FILTER_WRAPPER( I420_A8B8G8R8 ) +VIDEO_FILTER_WRAPPER_CLOSE( I420_R5G5B5, Deactivate ) +VIDEO_FILTER_WRAPPER_CLOSE( I420_R5G6B5, Deactivate ) +VIDEO_FILTER_WRAPPER_CLOSE( I420_A8R8G8B8, Deactivate ) +VIDEO_FILTER_WRAPPER_CLOSE( I420_R8G8B8A8, Deactivate ) +VIDEO_FILTER_WRAPPER_CLOSE( I420_B8G8R8A8, Deactivate ) +VIDEO_FILTER_WRAPPER_CLOSE( I420_A8B8G8R8, Deactivate ) #else -VIDEO_FILTER_WRAPPER( I420_RGB8 ) -VIDEO_FILTER_WRAPPER( I420_RGB16 ) -VIDEO_FILTER_WRAPPER( I420_RGB32 ) +VIDEO_FILTER_WRAPPER_CLOSE( I420_RGB8, Deactivate ) +VIDEO_FILTER_WRAPPER_CLOSE( I420_RGB16, Deactivate ) +VIDEO_FILTER_WRAPPER_CLOSE( I420_RGB32, Deactivate ) #endif /***************************************************************************** @@ -280,9 +280,8 @@ static int Activate( vlc_object_t *p_this ) ***************************************************************************** * This function frees the previously allocated chroma function *****************************************************************************/ -static void Deactivate( vlc_object_t *p_this ) +static void Deactivate( filter_t *p_filter ) { - filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys = p_filter->p_sys; #ifdef PLAIN _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
