summaryrefslogtreecommitdiffstats
path: root/TOOLS/vfw2menc.c
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/vfw2menc.c
parent2ad00b5319603b22f9b0858bb14d016f673157cb (diff)
parentcb8796857c8bd851e3b97d729af149e3f003b851 (diff)
downloadmpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.bz2
mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.xz
Merge svn changes up to r30748
Diffstat (limited to 'TOOLS/vfw2menc.c')
-rw-r--r--TOOLS/vfw2menc.c4
1 files changed, 2 insertions, 2 deletions
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)