*
* Authors: Jean-Paul Saman <jpsaman@videolan.org>
*
- * 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.
*****************************************************************************/
/*****************************************************************************
#define YUV4MPEG2_TEXT N_("YUV4MPEG2 header (default disabled)")
#define YUV4MPEG2_LONGTEXT N_("The YUV4MPEG2 header is compatible " \
- "with mplayer yuv video ouput and requires YV12/I420 fourcc. By default "\
+ "with mplayer yuv video output and requires YV12/I420 fourcc. By default "\
"vlc writes the fourcc of the picture frame into the output destination.")
#define CFG_PREFIX "yuv-"
set_subcategory(SUBCAT_VIDEO_VOUT)
set_capability("vout display", 0)
- add_string(CFG_PREFIX "file", "stream.yuv", NULL,
+ add_string(CFG_PREFIX "file", "stream.yuv",
YUV_FILE_TEXT, YUV_FILE_LONGTEXT, false)
- add_string(CFG_PREFIX "chroma", NULL, NULL,
+ add_string(CFG_PREFIX "chroma", NULL,
CHROMA_TEXT, CHROMA_LONGTEXT, true)
- add_bool (CFG_PREFIX "yuv4mpeg2", false, NULL,
+ add_bool (CFG_PREFIX "yuv4mpeg2", false,
YUV4MPEG2_TEXT, YUV4MPEG2_LONGTEXT, true)
set_callbacks(Open, Close)
/* */
static picture_pool_t *Pool (vout_display_t *, unsigned);
-static void Display(vout_display_t *, picture_t *);
+static void Display(vout_display_t *, picture_t *, subpicture_t *subpicture);
static int Control(vout_display_t *, int, va_list);
-static void Manage (vout_display_t *);
/*****************************************************************************
* vout_display_sys_t: video output descriptor
vd->prepare = NULL;
vd->display = Display;
vd->control = Control;
- vd->manage = Manage;
+ vd->manage = NULL;
vout_display_SendEventFullscreen(vd, false);
return VLC_SUCCESS;
return sys->pool;
}
-static void Display(vout_display_t *vd, picture_t *picture)
+static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpicture)
{
vout_display_sys_t *sys = vd->sys;
/* */
picture_Release(picture);
+ VLC_UNUSED(subpicture);
}
static int Control(vout_display_t *vd, int query, va_list args)
return VLC_EGENERIC;
}
}
-static void Manage (vout_display_t *vd)
-{
- VLC_UNUSED(vd);
-}