X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_video_splitter.h;h=eb2bf00f85a3ee2df1c35a90f12da4099a95a463;hb=673a01e1dd2333bfda50bc809584b5768aafe96a;hp=7f1309635ba40dfe306c257e4f58b10c8582286f;hpb=36306a1881d4001e929ca0ea8edf1b48fa9060d3;p=vlc diff --git a/include/vlc_video_splitter.h b/include/vlc_video_splitter.h index 7f1309635b..eb2bf00f85 100644 --- a/include/vlc_video_splitter.h +++ b/include/vlc_video_splitter.h @@ -6,19 +6,19 @@ * * Authors: Laurent Aimar * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef VLC_VIDEO_SPLITTER_H @@ -47,14 +47,13 @@ typedef struct /* Window hints */ struct { - /* Position - * Use (-1,-1) if you do not wish to force a position. + /* Relative position. + * (0,0) is equal to the default position. */ int i_x; int i_y; /* Alignment inside the window - * Use 0 for default. */ int i_align; } window; @@ -134,8 +133,8 @@ static inline void video_splitter_DeletePicture( video_splitter_t *p_splitter, } /* */ -VLC_EXPORT( video_splitter_t *, video_splitter_New, ( vlc_object_t *, const char *psz_name, const video_format_t * ) ); -VLC_EXPORT( void, video_splitter_Delete, ( video_splitter_t * ) ); +VLC_API video_splitter_t * video_splitter_New( vlc_object_t *, const char *psz_name, const video_format_t * ); +VLC_API void video_splitter_Delete( video_splitter_t * ); static inline int video_splitter_Filter( video_splitter_t *p_splitter, picture_t *pp_dst[], picture_t *p_src )