From b43adea6c850a3f8e8660428cfa4875e3d698ea6 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 6 Aug 2012 17:51:53 +0200 Subject: video_out: rename privsize member to priv_size --- libvo/video_out.c | 4 ++-- libvo/video_out.h | 4 ++-- libvo/vo_vdpau.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libvo/video_out.c b/libvo/video_out.c index e81026cd52..5dad7e2be4 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -172,8 +172,8 @@ const struct vo_driver *video_out_drivers[] = static int vo_preinit(struct vo *vo, char *arg) { - if (vo->driver->privsize) - vo->priv = talloc_zero_size(vo, vo->driver->privsize); + if (vo->driver->priv_size) + vo->priv = talloc_zero_size(vo, vo->driver->priv_size); if (vo->driver->options) { struct m_config *cfg = m_config_simple(vo->priv); talloc_steal(vo->priv, cfg); diff --git a/libvo/video_out.h b/libvo/video_out.h index 203e6b47b7..2bcb15bd4c 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -229,8 +229,8 @@ struct vo_driver { */ void (*uninit)(struct vo *vo); - // Size of private struct for automatic allocation - int privsize; + // Size of private struct for automatic allocation (0 doesn't allocate) + int priv_size; // List of options to parse into priv struct (requires privsize to be set) const struct m_option *options; diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index dd6ecd6448..d220762d8d 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -1694,7 +1694,7 @@ const struct vo_driver video_out_vdpau = { .flip_page_timed = flip_page_timed, .check_events = check_events, .uninit = uninit, - .privsize = sizeof(struct vdpctx), + .priv_size = sizeof(struct vdpctx), .options = (const struct m_option []){ OPT_INTRANGE("deint", deint, 0, -4, 4), OPT_FLAG_ON("chroma-deint", chroma_deint, 0, OPTDEF_INT(1)), -- cgit v1.2.3