877a486ac9
This adds a patch to fix compilation against alsa-lib 1.0.18. It is basically a grab of the change from mplayer repository. It also refreshes the other patches so they apply clean. Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
22 lines
515 B
Diff
22 lines
515 B
Diff
--- a/stream/stream_dvb.c
|
|
+++ b/stream/stream_dvb.c
|
|
@@ -37,9 +37,7 @@ Foundation, Inc., 675 Mass Ave, Cambridg
|
|
#include <sys/poll.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
-#include <string.h>
|
|
#include <errno.h>
|
|
-#include <fcntl.h>
|
|
|
|
#include "stream.h"
|
|
#include "libmpdemux/demuxer.h"
|
|
@@ -168,7 +166,7 @@ static dvb_channels_list *dvb_get_channe
|
|
if((line[0] == '#') || (strlen(line) == 0))
|
|
continue;
|
|
|
|
- colon = index(line, ':');
|
|
+ colon = strchr(line, ':');
|
|
if(colon)
|
|
{
|
|
k = colon - line;
|