summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-12 18:11:32 +0000
committerrfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-12 18:11:32 +0000
commit8f872aaeda7e59df64665ad4e8ca4e965262b6aa (patch)
tree6e15c16b192589fb76fe352cc1f699cf28fa44c0 /libmpdemux
parent661225715a42907d153bd8d37447bc89c88b02d1 (diff)
downloadmpv-8f872aaeda7e59df64665ad4e8ca4e965262b6aa.tar.bz2
mpv-8f872aaeda7e59df64665ad4e8ca4e965262b6aa.tar.xz
fix cosmetics noticed during nico's 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17831 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/muxer_lavf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index da1876a3a6..f182cbb8bf 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -113,16 +113,16 @@ static muxer_stream_t* lavf_new_stream(muxer_t *muxer, int type)
mp_msg(MSGT_MUXER, MSGL_ERR, "NULL MUXER PASSED OR UNKNOW TYPE %d\n", type);
return NULL;
}
- priv = (muxer_priv_t*) muxer->priv;
+ priv = muxer->priv;
- stream = (muxer_stream_t*) calloc(1, sizeof(muxer_stream_t));
+ stream = calloc(1, sizeof(muxer_stream_t));
if(!stream)
{
mp_msg(MSGT_MUXER, MSGL_ERR, "Could not alloc muxer_stream, EXIT\n");
return NULL;
}
muxer->streams[muxer->avih.dwStreams] = stream;
- stream->b_buffer = (unsigned char *)malloc(2048);
+ stream->b_buffer = malloc(2048);
if(!stream->b_buffer)
{
mp_msg(MSGT_MUXER, MSGL_ERR, "Could not alloc b_buffer, EXIT\n");
@@ -133,7 +133,7 @@ static muxer_stream_t* lavf_new_stream(muxer_t *muxer, int type)
stream->b_buffer_ptr = 0;
stream->b_buffer_len = 0;
- spriv = (muxer_stream_priv_t*) calloc(1, sizeof(muxer_stream_priv_t));
+ spriv = calloc(1, sizeof(muxer_stream_priv_t));
if(!spriv)
{
free(stream);