Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 19:47:32 +0000 (21:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 19:51:34 +0000 (21:51 +0200)
* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
  x11grab: Drop a spurious space in the extension reporting message

Conflicts:
libavdevice/x11grab.c

See: 9af209712099699d717596f55b08b3bac8b6b563
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavdevice/x11grab.c

@@@ -220,11 -221,9 +220,11 @@@ static int x11grab_read_header(AVFormat
                 x_off, y_off);
      }
  
 -    use_shm = XShmQueryExtension(dpy);
 -    av_log(s1, AV_LOG_INFO,
 -           "shared memory extension %sfound\n", use_shm ? "" : "not ");
 +    if (x11grab->use_shm) {
 +        use_shm = XShmQueryExtension(dpy);
 +        av_log(s1, AV_LOG_INFO,
-                "shared memory extension%s found\n", use_shm ? "" : " not");
++               "shared memory extension %sfound\n", use_shm ? "" : "not ");
 +    }
  
      if (use_shm) {
          int scr = XDefaultScreen(dpy);