Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'

* commit '7bb505a33ca131906b2ceb2f298e104c862740ea': x11grab: Drop a spurious space in the extension reporting message Conflicts: libavdevice/x11grab.c See: 9af2097120 Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 1fc3963188
parent 65c9e2d003 7bb505a33c
commit 1fc3963188
1 changed files with 1 additions and 1 deletions
--- 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) {