generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2014-08-28 21:47:32 +02:00
parent 65c9e2d003 7bb505a33c
commit 1fc3963188
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavdevice/x11grab.c
View File

@@ -223,7 +223,7 @@ static int x11grab_read_header(AVFormatContext *s1)
if (x11grab->use_shm) { if (x11grab->use_shm) {
use_shm = XShmQueryExtension(dpy); use_shm = XShmQueryExtension(dpy);
av_log(s1, AV_LOG_INFO, 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) { if (use_shm) {