summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 02:14:30 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 02:35:02 +0200
commitbc1d0ca37d9bdfd69a945043650e0246ffeb5f94 (patch)
tree8269c9cbc1df72afb5715b77669698a0781f6250 /input
parentf7cc4152f7c55808c5dd6bbd49c216c9345eb686 (diff)
parente9a5e7f667d1b0c0dec0053ad9ec6f7bc3162b60 (diff)
downloadmpv-bc1d0ca37d9bdfd69a945043650e0246ffeb5f94.tar.bz2
mpv-bc1d0ca37d9bdfd69a945043650e0246ffeb5f94.tar.xz
Merge svn changes up to r30798
Diffstat (limited to 'input')
-rw-r--r--input/input.c2
-rw-r--r--input/lirc.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/input/input.c b/input/input.c
index c5d93a5f17..6c5fef8b63 100644
--- a/input/input.c
+++ b/input/input.c
@@ -918,6 +918,8 @@ static int read_cmd(mp_input_fd_t* mp_fd, char** ret)
int l = 0;
// Find the cmd end
mp_fd->buffer[mp_fd->pos] = '\0';
+ end = strchr(mp_fd->buffer,'\r');
+ if (end) *end = '\n';
end = strchr(mp_fd->buffer,'\n');
// No cmd end ?
if(!end) {
diff --git a/input/lirc.c b/input/lirc.c
index 1e3708a3f4..7409ab698e 100644
--- a/input/lirc.c
+++ b/input/lirc.c
@@ -29,6 +29,7 @@
#include "mp_msg.h"
#include "help_mp.h"
#include "input.h"
+#include "lirc.h"
static struct lirc_config *lirc_config;
char *lirc_configfile;