summaryrefslogtreecommitdiffstats
path: root/TOOLS
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 01:46:46 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 01:50:55 +0200
commite74708f6194ef0af2bdf37e857ed232027fa46ba (patch)
treef7b53476abeb1cc8ccbe1c49113e9722c51b7800 /TOOLS
parent2ad00b5319603b22f9b0858bb14d016f673157cb (diff)
parentcb8796857c8bd851e3b97d729af149e3f003b851 (diff)
downloadmpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.bz2
mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.xz
Merge svn changes up to r30748
Diffstat (limited to 'TOOLS')
-rw-r--r--TOOLS/README9
-rw-r--r--TOOLS/bmovl-test.c2
-rw-r--r--TOOLS/vfw2menc.c4
3 files changed, 8 insertions, 7 deletions
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:
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)