[FFmpeg-cvslog] Cosmetics: Rename variable param as the more appropriate dpyname.
Sven C. Dack
git at videolan.org
Tue Apr 12 09:38:56 CEST 2011
ffmpeg | branch: master | Sven C. Dack <sven.c.dack at virginmedia.com> | Tue Apr 12 09:33:19 2011 +0200| [44a8b0ddd98cc5ef9eeaae73f380c4048a77ffe2] | committer: Carl Eugen Hoyos
Cosmetics: Rename variable param as the more appropriate dpyname.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44a8b0ddd98cc5ef9eeaae73f380c4048a77ffe2
---
libavdevice/x11grab.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavdevice/x11grab.c b/libavdevice/x11grab.c
index baf6fbb..fdc8a6d 100644
--- a/libavdevice/x11grab.c
+++ b/libavdevice/x11grab.c
@@ -92,20 +92,20 @@ x11grab_read_header(AVFormatContext *s1, AVFormatParameters *ap)
int x_off = 0;
int y_off = 0;
int use_shm;
- char *param, *offset;
+ char *dpyname, *offset;
- param = av_strdup(s1->filename);
- offset = strchr(param, '+');
+ dpyname = av_strdup(s1->filename);
+ offset = strchr(dpyname, '+');
if (offset) {
sscanf(offset, "%d,%d", &x_off, &y_off);
x11grab->nomouse= strstr(offset, "nomouse");
*offset= 0;
}
- av_log(s1, AV_LOG_INFO, "device: %s -> display: %s x: %d y: %d width: %d height: %d\n", s1->filename, param, x_off, y_off, ap->width, ap->height);
+ av_log(s1, AV_LOG_INFO, "device: %s -> display: %s x: %d y: %d width: %d height: %d\n", s1->filename, dpyname, x_off, y_off, ap->width, ap->height);
- dpy = XOpenDisplay(param);
- av_freep(¶m);
+ dpy = XOpenDisplay(dpyname);
+ av_freep(&dpyname);
if(!dpy) {
av_log(s1, AV_LOG_ERROR, "Could not open X display.\n");
return AVERROR(EIO);
More information about the ffmpeg-cvslog
mailing list