From 7529306884a8a1fa49bbd7679fe501fbbacb8d9f Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 27 Feb 2010 20:32:55 +0000
Subject: Include lirc.h in lirc.c to add missing prototypes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30767 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 input/lirc.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'input')

diff --git a/input/lirc.c b/input/lirc.c
index d7fb95d7f8..d926988b82 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;
-- 
cgit v1.2.3


From 67f9e11d9336028e374b4c03b5632a8e28a54f7d Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 27 Feb 2010 23:09:15 +0000
Subject: Support all line ending types in mp_input_read_cmd.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30779 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 input/input.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'input')

diff --git a/input/input.c b/input/input.c
index baf0723a16..59afa23501 100644
--- a/input/input.c
+++ b/input/input.c
@@ -957,6 +957,8 @@ mp_input_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) {
-- 
cgit v1.2.3