Mercurial > mplayer.hg
comparison libmpdemux/demux_fli.c @ 19062:83c3afeab35d
drops casts from void * on malloc/calloc from libmpdemux code
author | reynaldo |
---|---|
date | Thu, 13 Jul 2006 16:41:13 +0000 |
parents | 4928dd61f136 |
children | 4d81dbdf46b9 |
comparison
equal
deleted
inserted
replaced
19061:86350b4b8203 | 19062:83c3afeab35d |
---|---|
67 return 1; | 67 return 1; |
68 } | 68 } |
69 | 69 |
70 static demuxer_t* demux_open_fli(demuxer_t* demuxer){ | 70 static demuxer_t* demux_open_fli(demuxer_t* demuxer){ |
71 sh_video_t *sh_video = NULL; | 71 sh_video_t *sh_video = NULL; |
72 fli_frames_t *frames = (fli_frames_t *)malloc(sizeof(fli_frames_t)); | 72 fli_frames_t *frames = malloc(sizeof(fli_frames_t)); |
73 int frame_number; | 73 int frame_number; |
74 int speed; | 74 int speed; |
75 unsigned int frame_size; | 75 unsigned int frame_size; |
76 int magic_number; | 76 int magic_number; |
77 unsigned char * header; | 77 unsigned char * header; |
102 frames->num_frames = stream_read_word_le(demuxer->stream); | 102 frames->num_frames = stream_read_word_le(demuxer->stream); |
103 frames->current_frame = 0; | 103 frames->current_frame = 0; |
104 | 104 |
105 // allocate enough entries for the indices | 105 // allocate enough entries for the indices |
106 // audit: num_frames is 16bit so it is safe against overflow | 106 // audit: num_frames is 16bit so it is safe against overflow |
107 frames->filepos = (off_t *)malloc(frames->num_frames * sizeof(off_t)); | 107 frames->filepos = malloc(frames->num_frames * sizeof(off_t)); |
108 frames->frame_size = (int *)malloc(frames->num_frames * sizeof(int)); | 108 frames->frame_size = malloc(frames->num_frames * sizeof(int)); |
109 | 109 |
110 // create a new video stream header | 110 // create a new video stream header |
111 sh_video = new_sh_video(demuxer, 0); | 111 sh_video = new_sh_video(demuxer, 0); |
112 | 112 |
113 // make sure the demuxer knows about the new video stream header | 113 // make sure the demuxer knows about the new video stream header |