aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-28 21:47:32 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-28 21:51:34 +0200
commit1fc396318833280a520bf568d5605791decf87d7 (patch)
tree78af0fc0254e2ba38d8911d8d76986cd842bfb90 /libavdevice
parent65c9e2d0030d76c055461e25e22b9e8fa641560d (diff)
parent7bb505a33ca131906b2ceb2f298e104c862740ea (diff)
downloadffmpeg-1fc396318833280a520bf568d5605791decf87d7.tar.gz
Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'
* 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>
Diffstat (limited to 'libavdevice')
-rw-r--r--libavdevice/x11grab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index 605c6209e1..b4d2560882 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -223,7 +223,7 @@ static int x11grab_read_header(AVFormatContext *s1)
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) {