]> git.sesse.net Git - vlc/commitdiff
Fixed vout display module wrapper with locked/unlocked picture pool.
authorLaurent Aimar <fenrir@videolan.org>
Sun, 3 Jan 2010 20:25:39 +0000 (21:25 +0100)
committerLaurent Aimar <fenrir@videolan.org>
Tue, 5 Jan 2010 20:06:31 +0000 (21:06 +0100)
modules/video_output/wrapper.c

index 908e82182bb0601ae81cc5cb1ce2e8f21f284be5..799ebae8bd1a1d83d5c707b873db7331d24af234 100644 (file)
@@ -512,8 +512,15 @@ static void Display(vout_thread_t *vout, picture_t *picture)
 
      vout_display_Display(vd, direct);
 
-     if (!sys->use_dr)
+     if (sys->use_dr) {
+         for (int i = 0; i < picture->i_planes; i++) {
+             picture->p[i].p_pixels = direct->p[i].p_pixels;
+             picture->p[i].i_pitch  = direct->p[i].i_pitch;
+             picture->p[i].i_lines  = direct->p[i].i_lines;
+         }
+     } else {
          picture->p_sys->direct = NULL;
+     }
 }
 
 static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, const char *title)