/*****************************************************************************
* mosaic.h:
*****************************************************************************
- * Copyright (C) 2004-2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2004-2008 the VideoLAN team
* $Id$
*
* Authors: Antoine Cellerier <dionoea@videolan.org>
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
typedef struct bridged_es_t
es_format_t fmt;
picture_t *p_picture;
picture_t **pp_last;
- vlc_bool_t b_empty;
+ bool b_empty;
char *psz_id;
+
+ int i_alpha;
+ int i_x;
+ int i_y;
} bridged_es_t;
typedef struct bridge_t
#define GetBridge(a) __GetBridge( VLC_OBJECT(a) )
static bridge_t *__GetBridge( vlc_object_t *p_object )
{
- libvlc_t *p_libvlc = p_object->p_libvlc;
- bridge_t *p_bridge;
+ vlc_object_t *p_libvlc = VLC_OBJECT( p_object->p_libvlc );
vlc_value_t val;
if( var_Get( p_libvlc, "mosaic-struct", &val ) != VLC_SUCCESS )
{
- p_bridge = NULL;
+ return NULL;
}
else
{
- p_bridge = val.p_address;
- }
-
- return p_bridge;
+ return val.p_address;
+ }
}