summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-19 17:15:56 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-19 17:15:56 +0000
commitdaa6cb6cab7d786b459a337847caf54ecd0031da (patch)
tree08ce594c2202278e0d47bbe63eecff843e1be051 /mplayer.c
parentd7f314b0a969afbda357f978396f7fc476875201 (diff)
downloadmpv-daa6cb6cab7d786b459a337847caf54ecd0031da.tar.bz2
mpv-daa6cb6cab7d786b459a337847caf54ecd0031da.tar.xz
Get rid of a few more useless malloc casts
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23828 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mplayer.c b/mplayer.c
index 113946d388..1680f8b6fc 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -493,12 +493,12 @@ char *get_metadata (metadata_t type) {
meta = strdup ("h264");
else if (sh_video->format >= 0x20202020)
{
- meta = (char *) malloc (8);
+ meta = malloc (8);
sprintf (meta, "%.4s", (char *) &sh_video->format);
}
else
{
- meta = (char *) malloc (8);
+ meta = malloc (8);
sprintf (meta, "0x%08X", sh_video->format);
}
return meta;
@@ -506,14 +506,14 @@ char *get_metadata (metadata_t type) {
case META_VIDEO_BITRATE:
{
- meta = (char *) malloc (16);
+ meta = malloc (16);
sprintf (meta, "%d kbps", (int) (sh_video->i_bps * 8 / 1024));
return meta;
}
case META_VIDEO_RESOLUTION:
{
- meta = (char *) malloc (16);
+ meta = malloc (16);
sprintf (meta, "%d x %d", sh_video->disp_w, sh_video->disp_h);
return meta;
}
@@ -527,14 +527,14 @@ char *get_metadata (metadata_t type) {
case META_AUDIO_BITRATE:
{
- meta = (char *) malloc (16);
+ meta = malloc (16);
sprintf (meta, "%d kbps", (int) (sh_audio->i_bps * 8/1000));
return meta;
}
case META_AUDIO_SAMPLES:
{
- meta = (char *) malloc (16);
+ meta = malloc (16);
sprintf (meta, "%d Hz, %d ch.", sh_audio->samplerate, sh_audio->channels);
return meta;
}