← Back to branch summary

~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to modules/video_output/xcb/x11.c

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-09-05 02:42:37 UTC
  • mfrom: (1.1.34 upstream)
  • Revision ID: james.westby@ubuntu.com-20100905024237-up2v4og4bogk0xka
Tags: 1.1.4-1ubuntu1
* Merge from Debian experimental, remaining changes:
  - build and install the libx264 plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/video_output/xcb/x11.c
430
430
 
431
431
    if (!p_sys->visible)
432
432
        goto out;
 
433
    xcb_force_screen_saver (p_sys->conn, XCB_SCREEN_SAVER_RESET);
 
434
 
433
435
    if (segment != 0)
434
436
        ck = xcb_shm_put_image_checked (p_sys->conn, p_sys->window, p_sys->gc,
435
437
          /* real width */ pic->p->i_pitch / pic->p->i_pixel_pitch,