[vlc-commits] vmem: pass usual full dimensions as before

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Sep 23 20:10:20 2013 +0300| [fd890ca43a91cd4e6c9ef670f0e53cc82ffb2474] | committer: Rémi Denis-Courmont

vmem: pass usual full dimensions as before

There is no way for vmem to know the required padding otherwise.
This partly reverts commit 260a3c10be5cac6e7cbed0a551759760914fe313.

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

 modules/video_output/vmem.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index cea5086..2575f75 100644
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -149,8 +149,8 @@ static int Open(vlc_object_t *object)
         memset(sys->pitches, 0, sizeof(sys->pitches));
         memset(sys->lines, 0, sizeof(sys->lines));
 
-        sys->count = setup(&sys->opaque, chroma, &fmt.i_visible_width,
-                           &fmt.i_visible_height, sys->pitches, sys->lines);
+        sys->count = setup(&sys->opaque, chroma, &fmt.i_width, &fmt.i_height,
+                           sys->pitches, sys->lines);
         if (sys->count == 0) {
             msg_Err(vd, "video format setup failure (no pictures)");
             free(sys);
@@ -163,8 +163,8 @@ static int Open(vlc_object_t *object)
         fmt.i_chroma = vlc_fourcc_GetCodecFromString(VIDEO_ES, chroma);
         free(chroma);
 
-        fmt.i_visible_width  = var_InheritInteger(vd, "vmem-width");
-        fmt.i_visible_height = var_InheritInteger(vd, "vmem-height");
+        fmt.i_width  = var_InheritInteger(vd, "vmem-width");
+        fmt.i_height = var_InheritInteger(vd, "vmem-height");
         sys->pitches[0] = var_InheritInteger(vd, "vmem-pitch");
         sys->lines[0] = fmt.i_height;
         for (size_t i = 1; i < PICTURE_PLANE_MAX; i++)
@@ -176,8 +176,8 @@ static int Open(vlc_object_t *object)
         sys->cleanup = NULL;
     }
     fmt.i_x_offset = fmt.i_y_offset = 0;
-    fmt.i_width = fmt.i_visible_width;
-    fmt.i_height = fmt.i_visible_height;
+    fmt.i_visible_width = fmt.i_width;
+    fmt.i_visible_height = fmt.i_height;
 
     if (!fmt.i_chroma) {
         msg_Err(vd, "vmem-chroma should be 4 characters long");