Merge svn changes up to r30748

10 files changed, 26 insertions, 27 deletions

diff --git a/libmpdemux/demux_aac.c b/libmpdemux/demux_aac.c
index cfbedfc8c1..54493fb466 100644
--- a/libmpdemux/demux_aac.c
+++ b/libmpdemux/demux_aac.c
@@ -47,7 +47,7 @@ static int demux_aac_init(demuxer_t *demuxer)
 	if(!priv)
 		return 0;
 
-	priv->buf = (uint8_t*) malloc(8);
+	priv->buf = malloc(8);
 	if(!priv->buf)
 	{
 		free(priv);
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index e453f61ad4..aa3dfdae80 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -1252,7 +1252,7 @@ demuxer_t* init_avi_with_ogg(demuxer_t* demuxer) {
   demux_packet_t *dp;
   sh_audio_t *sh_audio = demuxer->audio->sh;
   int np;
-  uint8_t *extradata = sh_audio->wf + 1;
+  uint8_t *extradata = (uint8_t *)(sh_audio->wf + 1);
   int i;
   unsigned char *p = NULL,*buf;
   int plen;
diff --git a/libmpdemux/demux_roq.c b/libmpdemux/demux_roq.c
index 5c13d9739a..e51fab6717 100644
--- a/libmpdemux/demux_roq.c
+++ b/libmpdemux/demux_roq.c
@@ -191,7 +191,7 @@ static demuxer_t* demux_open_roq(demuxer_t* demuxer)
       }
 
       // index the chunk
-      roq_data->chunks = (roq_chunk_t *)realloc(roq_data->chunks,
+      roq_data->chunks = realloc(roq_data->chunks,
         (roq_data->total_chunks + 1) * sizeof (roq_chunk_t));
       roq_data->chunks[roq_data->total_chunks].chunk_type = CHUNK_TYPE_AUDIO;
       roq_data->chunks[roq_data->total_chunks].chunk_offset =
@@ -214,7 +214,7 @@ static demuxer_t* demux_open_roq(demuxer_t* demuxer)
     {
       // index a new chunk if it's a codebook or quad VQ not following a
       // codebook
-      roq_data->chunks = (roq_chunk_t *)realloc(roq_data->chunks,
+      roq_data->chunks = realloc(roq_data->chunks,
         (roq_data->total_chunks + 1) * sizeof (roq_chunk_t));
       roq_data->chunks[roq_data->total_chunks].chunk_type = CHUNK_TYPE_VIDEO;
       roq_data->chunks[roq_data->total_chunks].chunk_offset =
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index d27ae76596..0a79dcded5 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -320,7 +320,7 @@ static void ts_add_stream(demuxer_t * demuxer, ES_stream_t *es)
 
 		if(es->extradata && es->extradata_len)
 		{
-			sh->wf = (WAVEFORMATEX *) malloc(sizeof (WAVEFORMATEX) + es->extradata_len);
+			sh->wf = malloc(sizeof (WAVEFORMATEX) + es->extradata_len);
 			sh->wf->cbSize = es->extradata_len;
 			memcpy(sh->wf + 1, es->extradata, es->extradata_len);
 		}
@@ -344,7 +344,7 @@ static void ts_add_stream(demuxer_t * demuxer, ES_stream_t *es)
 			if(sh->format == VIDEO_AVC && es->extradata && es->extradata_len)
 			{
 				int w = 0, h = 0;
-				sh->bih = (BITMAPINFOHEADER *) calloc(1, sizeof(BITMAPINFOHEADER) + es->extradata_len);
+				sh->bih = calloc(1, sizeof(BITMAPINFOHEADER) + es->extradata_len);
 				sh->bih->biSize= sizeof(BITMAPINFOHEADER) + es->extradata_len;
 				sh->bih->biCompression = sh->format;
 				memcpy(sh->bih + 1, es->extradata, es->extradata_len);
@@ -680,7 +680,7 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param)
 				pptr = &pes_priv1[es.pid];
 				if(pptr->pos < 64*1024)
 				{
-				tmpbuf = (char*) realloc(pptr->buf, pptr->pos + es.size);
+				tmpbuf = realloc(pptr->buf, pptr->pos + es.size);
 				if(tmpbuf != NULL)
 				{
 					pptr->buf = tmpbuf;
@@ -1678,7 +1678,7 @@ static int collect_section(ts_section_t *section, int is_start, unsigned char *b
 	{
 		if(! section->buffer)
 		{
-			section->buffer = (uint8_t*) malloc(4096+256);
+			section->buffer = malloc(4096 + 256);
 			if(section->buffer == NULL)
 				return 0;
 		}
@@ -2697,7 +2697,7 @@ static int fill_extradata(mp4_decoder_config_t * mp4_dec, ES_stream_t *tss)
 
 	if(mp4_dec->buf_size > tss->extradata_alloc)
 	{
-		tmp = (uint8_t *) realloc(tss->extradata, mp4_dec->buf_size);
+		tmp = realloc(tss->extradata, mp4_dec->buf_size);
 		if(!tmp)
 			return 0;
 		tss->extradata = tmp;
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 589cdeeb37..e00a9cfb68 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -1301,8 +1301,7 @@ int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param)
         }
     }
 
-    info = demuxer->info =
-        (char **) realloc(info, (2 * (n + 2)) * sizeof(char *));
+    info = demuxer->info = realloc(info, (2 * (n + 2)) * sizeof(char *));
     info[2 * n] = strdup(opt);
     info[2 * n + 1] = strdup(param);
     memset(&info[2 * (n + 1)], 0, 2 * sizeof(char *));
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 1f16ea4eda..e529c2535b 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -279,7 +279,7 @@ typedef struct {
 } demux_program_t;
 
 static inline demux_packet_t* new_demux_packet(int len){
-  demux_packet_t* dp=(demux_packet_t*)malloc(sizeof(demux_packet_t));
+  demux_packet_t* dp = malloc(sizeof(demux_packet_t));
   dp->len=len;
   dp->next=NULL;
   dp->pts=MP_NOPTS_VALUE;
@@ -290,7 +290,7 @@ static inline demux_packet_t* new_demux_packet(int len){
   dp->refcount=1;
   dp->master=NULL;
   dp->buffer=NULL;
-  if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + MP_INPUT_BUFFER_PADDING_SIZE)))
+  if (len > 0 && (dp->buffer = malloc(len + MP_INPUT_BUFFER_PADDING_SIZE)))
     memset(dp->buffer + len, 0, 8);
   else
     dp->len = 0;
@@ -301,7 +301,7 @@ static inline void resize_demux_packet(demux_packet_t* dp, int len)
 {
   if(len > 0)
   {
-     dp->buffer=(unsigned char *)realloc(dp->buffer,len+8);
+     dp->buffer = realloc(dp->buffer, len + 8);
   }
   else
   {
@@ -316,7 +316,7 @@ static inline void resize_demux_packet(demux_packet_t* dp, int len)
 }
 
 static inline demux_packet_t* clone_demux_packet(demux_packet_t* pack){
-  demux_packet_t* dp=(demux_packet_t*)malloc(sizeof(demux_packet_t));
+  demux_packet_t* dp = malloc(sizeof(demux_packet_t));
   while(pack->master) pack=pack->master; // find the master
   memcpy(dp,pack,sizeof(demux_packet_t));
   dp->next=NULL;
diff --git a/libmpdemux/ebml.c b/libmpdemux/ebml.c
index ab35237a44..166c5df5cd 100644
--- a/libmpdemux/ebml.c
+++ b/libmpdemux/ebml.c
@@ -225,7 +225,7 @@ char *ebml_read_ascii(stream_t *s, uint64_t *length)
     if (length)
         *length = len + l;
 
-    str = (char *) malloc(len + 1);
+    str = malloc(len + 1);
     if (stream_read(s, str, len) != (int) len) {
         free(str);
         return NULL;
diff --git a/libmpdemux/muxer_lavf.c b/libmpdemux/muxer_lavf.c
index ed6025317d..300381a239 100644
--- a/libmpdemux/muxer_lavf.c
+++ b/libmpdemux/muxer_lavf.c
@@ -340,7 +340,7 @@ int muxer_init_muxer_lavf(muxer_t *muxer)
 "will play these INCORRECT files as if nothing were wrong!\n"
 "*******************************************************************************\n");
 
-	priv = (muxer_priv_t *) calloc(1, sizeof(muxer_priv_t));
+	priv = calloc(1, sizeof(muxer_priv_t));
 	if(priv == NULL)
 		return 0;
 
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 223a18ad67..27ff5d98db 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -339,13 +339,13 @@ static mpeg_frame_t *init_frames(uint16_t num, size_t size)
 	mpeg_frame_t *tmp;
 	uint16_t i;
 
-	tmp = (mpeg_frame_t *) calloc(num, sizeof(mpeg_frame_t));
+	tmp = calloc(num, sizeof(mpeg_frame_t));
 	if(tmp == NULL)
 		return NULL;
 
 	for(i=0; i < num; i++)
 	{
-		tmp[i].buffer = (uint8_t *) calloc(1, size);
+		tmp[i].buffer = calloc(1, size);
 		if(tmp[i].buffer == NULL)
 			return NULL;
 		tmp[i].size = 0;
@@ -386,14 +386,14 @@ static muxer_stream_t* mpegfile_new_stream(muxer_t *muxer,int type){
       mp_msg(MSGT_MUXER, MSGL_ERR, "Unknown stream type!\n");
       return NULL;
   }
-  s = (muxer_stream_t*) calloc(1, sizeof(muxer_stream_t));
+  s = calloc(1, sizeof(muxer_stream_t));
   if(!s) return NULL; // no mem!?
   if (!(s->b_buffer = malloc(priv->packet_size)))
     goto init_fail;
   s->b_buffer_size = priv->packet_size;
   s->b_buffer_ptr = 0;
   s->b_buffer_len = 0;
-  s->priv = (muxer_headers_t*) calloc(1, sizeof(muxer_headers_t));
+  s->priv = calloc(1, sizeof(muxer_headers_t));
   if(s->priv == NULL)
     goto init_fail;
   spriv = (muxer_headers_t *) s->priv;
@@ -1964,7 +1964,7 @@ static int fill_last_frame(muxer_headers_t *spriv,  uint8_t *ptr, int len)
 	{
 		if(spriv->framebuf[idx].size > SIZE_MAX - (size_t)len)
 			return 0;
-		spriv->framebuf[idx].buffer = (uint8_t*) realloc(spriv->framebuf[idx].buffer, spriv->framebuf[idx].size + len);
+		spriv->framebuf[idx].buffer = realloc(spriv->framebuf[idx].buffer, spriv->framebuf[idx].size + len);
 		if(! spriv->framebuf[idx].buffer)
 			return 0;
 		spriv->framebuf[idx].alloc_size = spriv->framebuf[idx].size + len;
@@ -1983,7 +1983,7 @@ static int add_frame(muxer_headers_t *spriv, uint64_t idur, uint8_t *ptr, int le
 	idx = spriv->framebuf_used;
 	if(idx >= spriv->framebuf_cnt)
 	{
-		spriv->framebuf = (mpeg_frame_t*) realloc_struct(spriv->framebuf, (spriv->framebuf_cnt+1), sizeof(mpeg_frame_t));
+		spriv->framebuf = realloc_struct(spriv->framebuf, (spriv->framebuf_cnt+1), sizeof(mpeg_frame_t));
 		if(spriv->framebuf == NULL)
 		{
 			mp_msg(MSGT_MUXER, MSGL_FATAL, "Couldn't realloc frame buffer(idx), abort\n");
@@ -1994,7 +1994,7 @@ static int add_frame(muxer_headers_t *spriv, uint64_t idur, uint8_t *ptr, int le
 		spriv->framebuf[spriv->framebuf_cnt].alloc_size = 0;
 		spriv->framebuf[spriv->framebuf_cnt].pos = 0;
 
-		spriv->framebuf[spriv->framebuf_cnt].buffer = (uint8_t*) malloc(len);
+		spriv->framebuf[spriv->framebuf_cnt].buffer = malloc(len);
 		if(spriv->framebuf[spriv->framebuf_cnt].buffer == NULL)
 		{
 			mp_msg(MSGT_MUXER, MSGL_FATAL, "Couldn't realloc frame buffer(frame), abort\n");
@@ -2500,7 +2500,7 @@ static void generate_flags(uint8_t *bff_mask, int source, int target)
 int muxer_init_muxer_mpeg(muxer_t *muxer)
 {
 	muxer_priv_t *priv;
-	priv = (muxer_priv_t *) calloc(1, sizeof(muxer_priv_t));
+	priv = calloc(1, sizeof(muxer_priv_t));
 	if(priv == NULL)
 	return 0;
 	priv->update_system_header = 1;
@@ -2716,7 +2716,7 @@ int muxer_init_muxer_mpeg(muxer_t *muxer)
 
 	priv->drop = conf_drop;
 
-	priv->buff = (uint8_t *) malloc(priv->packet_size);
+	priv->buff = malloc(priv->packet_size);
 	if((priv->buff == NULL))
 	{
 		mp_msg(MSGT_MUXER, MSGL_ERR, "\nCouldn't allocate %d bytes, exit\n", priv->packet_size);
diff --git a/libmpdemux/video.c b/libmpdemux/video.c
index f29f83bf9b..726e656553 100644
--- a/libmpdemux/video.c
+++ b/libmpdemux/video.c
@@ -382,7 +382,7 @@ mpeg_header_parser:
    }
 
    if(mp_vc1_decode_sequence_header(&picture, &videobuffer[4], videobuf_len-4)) {
-     sh_video->bih = (BITMAPINFOHEADER *) calloc(1, sizeof(BITMAPINFOHEADER) + videobuf_len);
+     sh_video->bih = calloc(1, sizeof(BITMAPINFOHEADER) + videobuf_len);
      if(sh_video->bih == NULL) {
        mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Couldn't alloc %d bytes for VC-1 extradata!\n", sizeof(BITMAPINFOHEADER) + videobuf_len);
        return 0;