diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-20 13:06:17 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-01-20 13:06:17 +0000 |
| commit | 8823921db82bec0d0d5a05864f222513a09d7fea (patch) | |
| tree | 248979df99adc26549ee0f497a9ae0520a721487 /libmpdemux | |
| parent | 488013915fe999b705e7ea2e6e28496f8bceb1fd (diff) | |
| download | mpv-8823921db82bec0d0d5a05864f222513a09d7fea.tar.bz2 mpv-8823921db82bec0d0d5a05864f222513a09d7fea.tar.xz | |
removed unused variables; replaced wrong call to realloc() with calloc() in vc1 probing code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21968 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/video.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index edae520277..4b3afdbe67 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -358,7 +358,6 @@ mpeg_header_parser: break; } case VIDEO_VC1: { - int j; // Find sequence_header: videobuf_len=0; videobuf_code_len=0; @@ -401,7 +400,7 @@ mpeg_header_parser: if(mp_vc1_decode_sequence_header(&picture, &videobuffer[4], videobuf_len-4)) { - sh_video->bih = (BITMAPINFOHEADER *) realloc(sh_video->bih, sizeof(BITMAPINFOHEADER) + videobuf_len); + sh_video->bih = (BITMAPINFOHEADER *) calloc(1, sizeof(BITMAPINFOHEADER) + videobuf_len); sh_video->bih->biSize= sizeof(BITMAPINFOHEADER) + videobuf_len; memcpy(sh_video->bih + 1, videobuffer, videobuf_len); sh_video->bih->biCompression = sh_video->format; @@ -611,7 +610,6 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** videobuf_len=0; } else if((demuxer->file_format==DEMUXER_TYPE_MPEG_PS) && (sh_video->format==mmioFOURCC('W', 'V', 'C', '1'))) { - int j; while(videobuf_len<VIDEOBUFFER_SIZE-MAX_VIDEO_PACKET_SIZE) { int i=sync_video_packet(d_video); if(!i) return -1; |