From fad137d7fe3bfef6a258518a1e86a4d811d3b4b5 Mon Sep 17 00:00:00 2001 From: attila Date: Fri, 26 Feb 2010 12:49:49 +0000 Subject: mention that on windows, you've to use the netstream.exe to build the netstream binary git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30743 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/README | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'TOOLS') diff --git a/TOOLS/README b/TOOLS/README index 37a7a03afd..eaa75bf0de 100644 --- a/TOOLS/README +++ b/TOOLS/README @@ -542,10 +542,11 @@ are not usable remotely because they are implemented at the demuxer level. Be aware that currently the server is not secure at all. -Compile the server by running 'make TOOLS/netstream' from the root of mplayer -source and then copy the netstream binary to the right place on your system -(usually /usr/local/bin on Unix). Start the netstream server on the computer you -intend to access remotely. There are no command line arguments. +Compile the server by running 'make TOOLS/netstream' ('make TOOLS/netstream.exe' +on windows) from the root of mplayer source and then copy the netstream binary +to the right place on your system (usually /usr/local/bin on Unix). Start the +netstream server on the computer you intend to access remotely. There are no +command line arguments. Play the second track of a VCD on the server with: -- cgit v1.2.3 From b63759b175cf9ddd9735ca0d2f803fe62f69c3c3 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 26 Feb 2010 15:01:37 +0000 Subject: Do not cast the results of malloc/calloc/realloc. These functions return void*, which is compatible with any pointer, so there is no need for casts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/bmovl-test.c | 2 +- TOOLS/vfw2menc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'TOOLS') diff --git a/TOOLS/bmovl-test.c b/TOOLS/bmovl-test.c index b6d0f55022..04c1e7dd71 100644 --- a/TOOLS/bmovl-test.c +++ b/TOOLS/bmovl-test.c @@ -104,7 +104,7 @@ int main(int argc, char **argv) { blit(fifo, image->pixels, image->w, image->h, i, i, 0, 1); // Create a 75x75 bitmap - bitmap = (unsigned char*)malloc(75*75*4); + bitmap = malloc(75 * 75 * 4); // Paint bitmap red, 50% transparent and blit at position 50,50 paint(bitmap, (75*75*4), 255, 0, 0, 128); diff --git a/TOOLS/vfw2menc.c b/TOOLS/vfw2menc.c index b15b773a05..bdeb960351 100644 --- a/TOOLS/vfw2menc.c +++ b/TOOLS/vfw2menc.c @@ -72,7 +72,7 @@ static int save_settings(HDRVR hDriver, const char *filename) return -1; } - pv = (char *) malloc(cb); + pv = malloc(cb); if (SendDriverMessage(hDriver, ICM_GETSTATE, (LPARAM) pv, (LPARAM) &cb) != ICERR_OK) { printf("ICM_GETSTATE failed\n"); @@ -112,7 +112,7 @@ static int load_settings(HDRVR hDriver, const char *filename) return -1; } - pv = (char *) malloc(info.st_size); + pv = malloc(info.st_size); fd = fopen(filename, "rb"); if (!fd) -- cgit v1.2.3