Merge svn changes up to r30798

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;