summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-26 00:58:15 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-26 00:58:15 +0200
commitdd888b05ff3af1c6c35582e75bedae687d38fc66 (patch)
tree7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9 /input
parent0406d951209df261970424256d76f293649ec140 (diff)
parent85b28eb411cfa304f1714219ebd17b10a0977fa3 (diff)
downloadmpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.bz2
mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.xz
Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c
Diffstat (limited to 'input')
-rw-r--r--input/lirc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/input/lirc.c b/input/lirc.c
index fec56f4828..4012d5b340 100644
--- a/input/lirc.c
+++ b/input/lirc.c
@@ -76,7 +76,7 @@ int mp_input_lirc_read(int fd,char* dest, int s) {
return w;
}
- // Nothing in the buffer, pool the lirc fd
+ // Nothing in the buffer, poll the lirc fd
FD_ZERO(&fds);
FD_SET(fd,&fds);
memset(&tv,0,sizeof(tv));