[vlc-commits] commit: vmem: use var_Inherit* ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Sat Jul 10 11:51:15 CEST 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Jul  9 17:56:45 2010 +0300| [ef186aec55c5425ef7d913f365f6452ce3057465] | committer: Rémi Denis-Courmont 

vmem: use var_Inherit*

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ef186aec55c5425ef7d913f365f6452ce3057465
---

 modules/video_output/vmem.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index be1ef6d..ff4cf35 100644
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -123,7 +123,7 @@ static int Open(vlc_object_t *object)
     vout_display_t *vd = (vout_display_t *)object;
 
     /* */
-    char *chroma_format = var_CreateGetString(vd, "vmem-chroma");
+    char *chroma_format = var_InheritString(vd, "vmem-chroma");
     const vlc_fourcc_t chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, chroma_format);
     free(chroma_format);
     if (!chroma) {
@@ -157,8 +157,8 @@ static int Open(vlc_object_t *object)
     video_format_t fmt = vd->fmt;
 
     fmt.i_chroma = chroma;
-    fmt.i_width  = var_CreateGetInteger(vd, "vmem-width");
-    fmt.i_height = var_CreateGetInteger(vd, "vmem-height");
+    fmt.i_width  = var_InheritInteger(vd, "vmem-width");
+    fmt.i_height = var_InheritInteger(vd, "vmem-height");
 
     /* Define the bitmasks */
     switch (chroma)
@@ -197,7 +197,7 @@ static int Open(vlc_object_t *object)
         return VLC_EGENERIC;
 
     /* */
-    const int pitch = var_CreateGetInteger(vd, "vmem-pitch");
+    const int pitch = var_InheritInteger(vd, "vmem-pitch");
     picture_resource_t rsc;
     rsc.p_sys = malloc(sizeof(*rsc.p_sys));
     *rsc.p_sys = cfg;



More information about the vlc-commits mailing list